mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-27 05:00:15 +00:00
05b68e14b1
Many headers are expected to expose a subset of the type definitions
in time.h. time.h has a whole bunch of messy logic for conditionally
defining some its types and structs, but, as best I can tell, this
has never worked 100%. In particular, __need_timespec is ineffective
if _TIME_H has already been defined, which means that if you compile
#include <time.h>
#include <sched.h>
with e.g. -fsyntax-only -std=c89 -Wall -Wsystem-headers, you will get
In file included from test.c:2:0:
/usr/include/sched.h:74:57: warning: "struct timespec" declared inside
parameter list will not be visible outside of this definition or declaration
extern int sched_rr_get_interval (__pid_t __pid, struct timespec *__t) __THROW;
^~~~~~~~
And if you want to _use_ sched_rr_get_interval in a TU compiled that
way, you're hosed.
This patch replaces all of that with small bits/types/TYPE.h headers
as introduced earlier. time.h and bits/time.h are now *much* simpler,
and a lot of other headers are slightly simpler.
* time/time.h, bits/time.h, sysdeps/unix/sysv/linux/bits/time.h:
Remove all logic conditional on __need macros. Move all the
conditionally defined types to their own headers...
* time/bits/types/clock_t.h: Define clock_t here.
* time/bits/types/clockid_t.h: Define clockid_t here.
* time/bits/types/struct_itimerspec.h: Define struct itimerspec here.
* time/bits/types/struct_timespec.h: Define struct timespec here.
* time/bits/types/struct_timeval.h: Define struct timeval here.
* time/bits/types/struct_tm.h: Define struct tm here.
* time/bits/types/time_t.h: Define time_t here.
* time/bits/types/timer_t.h: Define timer_t here.
* time/Makefile: Install the new headers.
* bits/resource.h, io/fcntl.h, io/sys/poll.h, io/sys/stat.h
* io/utime.h, misc/sys/select.h, posix/sched.h, posix/sys/times.h
* posix/sys/types.h, resolv/netdb.h, rt/aio.h, rt/mqueue.h
* signal/signal.h, pthread/semaphore.h, sysdeps/nptl/pthread.h
* sysdeps/unix/sysv/linux/alpha/bits/resource.h
* sysdeps/unix/sysv/linux/alpha/sys/acct.h
* sysdeps/unix/sysv/linux/bits/resource.h
* sysdeps/unix/sysv/linux/bits/timex.h
* sysdeps/unix/sysv/linux/mips/bits/resource.h
* sysdeps/unix/sysv/linux/net/ppp_defs.h
* sysdeps/unix/sysv/linux/sparc/bits/resource.h
* sysdeps/unix/sysv/linux/sys/acct.h
* sysdeps/unix/sysv/linux/sys/timerfd.h
* sysvipc/sys/msg.h, sysvipc/sys/sem.h, sysvipc/sys/shm.h
* time/sys/time.h, time/sys/timeb.h
Use the new bits/types headers.
* include/time.h: Remove __need logic.
* include/bits/time.h
* include/bits/types/clock_t.h, include/bits/types/clockid_t.h
* include/bits/types/time_t.h, include/bits/types/timer_t.h
* include/bits/types/struct_itimerspec.h
* include/bits/types/struct_timespec.h
* include/bits/types/struct_timeval.h
* include/bits/types/struct_tm.h:
New wrapper headers.
100 lines
3.7 KiB
C
100 lines
3.7 KiB
C
/* Copyright (C) 2004-2016 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _MQUEUE_H
|
|
#define _MQUEUE_H 1
|
|
|
|
#include <features.h>
|
|
#include <sys/types.h>
|
|
#include <fcntl.h>
|
|
#define __need_sigevent_t
|
|
#include <bits/siginfo.h>
|
|
#include <bits/types/struct_timespec.h>
|
|
/* Get the definition of mqd_t and struct mq_attr. */
|
|
#include <bits/mqueue.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Establish connection between a process and a message queue NAME and
|
|
return message queue descriptor or (mqd_t) -1 on error. OFLAG determines
|
|
the type of access used. If O_CREAT is on OFLAG, the third argument is
|
|
taken as a `mode_t', the mode of the created message queue, and the fourth
|
|
argument is taken as `struct mq_attr *', pointer to message queue
|
|
attributes. If the fourth argument is NULL, default attributes are
|
|
used. */
|
|
extern mqd_t mq_open (const char *__name, int __oflag, ...)
|
|
__THROW __nonnull ((1));
|
|
|
|
/* Removes the association between message queue descriptor MQDES and its
|
|
message queue. */
|
|
extern int mq_close (mqd_t __mqdes) __THROW;
|
|
|
|
/* Query status and attributes of message queue MQDES. */
|
|
extern int mq_getattr (mqd_t __mqdes, struct mq_attr *__mqstat)
|
|
__THROW __nonnull ((2));
|
|
|
|
/* Set attributes associated with message queue MQDES and if OMQSTAT is
|
|
not NULL also query its old attributes. */
|
|
extern int mq_setattr (mqd_t __mqdes,
|
|
const struct mq_attr *__restrict __mqstat,
|
|
struct mq_attr *__restrict __omqstat)
|
|
__THROW __nonnull ((2));
|
|
|
|
/* Remove message queue named NAME. */
|
|
extern int mq_unlink (const char *__name) __THROW __nonnull ((1));
|
|
|
|
/* Register notification issued upon message arrival to an empty
|
|
message queue MQDES. */
|
|
extern int mq_notify (mqd_t __mqdes, const struct sigevent *__notification)
|
|
__THROW;
|
|
|
|
/* Receive the oldest from highest priority messages in message queue
|
|
MQDES. */
|
|
extern ssize_t mq_receive (mqd_t __mqdes, char *__msg_ptr, size_t __msg_len,
|
|
unsigned int *__msg_prio) __nonnull ((2));
|
|
|
|
/* Add message pointed by MSG_PTR to message queue MQDES. */
|
|
extern int mq_send (mqd_t __mqdes, const char *__msg_ptr, size_t __msg_len,
|
|
unsigned int __msg_prio) __nonnull ((2));
|
|
|
|
#ifdef __USE_XOPEN2K
|
|
/* Receive the oldest from highest priority messages in message queue
|
|
MQDES, stop waiting if ABS_TIMEOUT expires. */
|
|
extern ssize_t mq_timedreceive (mqd_t __mqdes, char *__restrict __msg_ptr,
|
|
size_t __msg_len,
|
|
unsigned int *__restrict __msg_prio,
|
|
const struct timespec *__restrict __abs_timeout)
|
|
__nonnull ((2, 5));
|
|
|
|
/* Add message pointed by MSG_PTR to message queue MQDES, stop blocking
|
|
on full message queue if ABS_TIMEOUT expires. */
|
|
extern int mq_timedsend (mqd_t __mqdes, const char *__msg_ptr,
|
|
size_t __msg_len, unsigned int __msg_prio,
|
|
const struct timespec *__abs_timeout)
|
|
__nonnull ((2, 5));
|
|
#endif
|
|
|
|
/* Define some inlines helping to catch common problems. */
|
|
#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function \
|
|
&& defined __va_arg_pack_len
|
|
# include <bits/mqueue2.h>
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* mqueue.h */
|