mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 19:30:10 +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.
134 lines
4.1 KiB
C
134 lines
4.1 KiB
C
/* `fd_set' type and related macros, and `select'/`pselect' declarations.
|
|
Copyright (C) 1996-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/>. */
|
|
|
|
/* POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h> */
|
|
|
|
#ifndef _SYS_SELECT_H
|
|
#define _SYS_SELECT_H 1
|
|
|
|
#include <features.h>
|
|
|
|
/* Get definition of needed basic types. */
|
|
#include <bits/types.h>
|
|
|
|
/* Get __FD_* definitions. */
|
|
#include <bits/select.h>
|
|
|
|
/* Get __sigset_t. */
|
|
#include <bits/sigset.h>
|
|
|
|
#ifndef __sigset_t_defined
|
|
# define __sigset_t_defined
|
|
typedef __sigset_t sigset_t;
|
|
#endif
|
|
|
|
/* Get definition of timer specification structures. */
|
|
#include <bits/types/time_t.h>
|
|
#include <bits/types/struct_timeval.h>
|
|
#ifdef __USE_XOPEN2K
|
|
# include <bits/types/struct_timespec.h>
|
|
#endif
|
|
|
|
#ifndef __suseconds_t_defined
|
|
typedef __suseconds_t suseconds_t;
|
|
# define __suseconds_t_defined
|
|
#endif
|
|
|
|
|
|
/* The fd_set member is required to be an array of longs. */
|
|
typedef long int __fd_mask;
|
|
|
|
/* Some versions of <linux/posix_types.h> define this macros. */
|
|
#undef __NFDBITS
|
|
/* It's easier to assume 8-bit bytes than to get CHAR_BIT. */
|
|
#define __NFDBITS (8 * (int) sizeof (__fd_mask))
|
|
#define __FD_ELT(d) ((d) / __NFDBITS)
|
|
#define __FD_MASK(d) ((__fd_mask) (1UL << ((d) % __NFDBITS)))
|
|
|
|
/* fd_set for select and pselect. */
|
|
typedef struct
|
|
{
|
|
/* XPG4.2 requires this member name. Otherwise avoid the name
|
|
from the global namespace. */
|
|
#ifdef __USE_XOPEN
|
|
__fd_mask fds_bits[__FD_SETSIZE / __NFDBITS];
|
|
# define __FDS_BITS(set) ((set)->fds_bits)
|
|
#else
|
|
__fd_mask __fds_bits[__FD_SETSIZE / __NFDBITS];
|
|
# define __FDS_BITS(set) ((set)->__fds_bits)
|
|
#endif
|
|
} fd_set;
|
|
|
|
/* Maximum number of file descriptors in `fd_set'. */
|
|
#define FD_SETSIZE __FD_SETSIZE
|
|
|
|
#ifdef __USE_MISC
|
|
/* Sometimes the fd_set member is assumed to have this type. */
|
|
typedef __fd_mask fd_mask;
|
|
|
|
/* Number of bits per word of `fd_set' (some code assumes this is 32). */
|
|
# define NFDBITS __NFDBITS
|
|
#endif
|
|
|
|
|
|
/* Access macros for `fd_set'. */
|
|
#define FD_SET(fd, fdsetp) __FD_SET (fd, fdsetp)
|
|
#define FD_CLR(fd, fdsetp) __FD_CLR (fd, fdsetp)
|
|
#define FD_ISSET(fd, fdsetp) __FD_ISSET (fd, fdsetp)
|
|
#define FD_ZERO(fdsetp) __FD_ZERO (fdsetp)
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Check the first NFDS descriptors each in READFDS (if not NULL) for read
|
|
readiness, in WRITEFDS (if not NULL) for write readiness, and in EXCEPTFDS
|
|
(if not NULL) for exceptional conditions. If TIMEOUT is not NULL, time out
|
|
after waiting the interval specified therein. Returns the number of ready
|
|
descriptors, or -1 for errors.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern int select (int __nfds, fd_set *__restrict __readfds,
|
|
fd_set *__restrict __writefds,
|
|
fd_set *__restrict __exceptfds,
|
|
struct timeval *__restrict __timeout);
|
|
|
|
#ifdef __USE_XOPEN2K
|
|
/* Same as above only that the TIMEOUT value is given with higher
|
|
resolution and a sigmask which is been set temporarily. This version
|
|
should be used.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern int pselect (int __nfds, fd_set *__restrict __readfds,
|
|
fd_set *__restrict __writefds,
|
|
fd_set *__restrict __exceptfds,
|
|
const struct timespec *__restrict __timeout,
|
|
const __sigset_t *__restrict __sigmask);
|
|
#endif
|
|
|
|
|
|
/* Define some inlines helping to catch common problems. */
|
|
#if __USE_FORTIFY_LEVEL > 0 && defined __GNUC__
|
|
# include <bits/select2.h>
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/select.h */
|