mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	The types affected are __sig_atomic_t, sig_atomic_t, __sigset_t, sigset_t, sigval_t, sigevent_t, and siginfo_t. __sig_atomic_t is a scalar, so it's now directly available from bits/types.h. The others get bits/types/ headers. Side effects include: There have been small changes to which non-signal headers expose which subset of the signal-related types. A couple of architectures' nested siginfo_t fields had to be renamed to prevent undesired macro expansion. Internal code that wants to manipulate signal masks must now include <sigsetops.h> (which is not installed) and should be aware that __sigaddset, __sigandset, __sigdelset, __sigemptyset, and __sigorset no longer return a value (unlike the public API). Relatedly, the public signal.h no longer declares any of those functions. The obsolete sigmask() macro no longer has a system-specific definition -- in the cases where it matters, it didn't work anyway. New Linux architectures should create bits/siginfo-arch.h and/or bits/siginfo-consts-arch.h to customize their siginfo_t, rather than duplicating everything in bits/siginfo.h (which no longer exists). Add new __SI_* macros if necessary. Ports to other operating systems are strongly encouraged to generalize this scheme further. * bits/sigevent-consts.h * bits/siginfo-consts.h * bits/types/__sigset_t.h * bits/types/sigevent_t.h * bits/types/siginfo_t.h * sysdeps/unix/sysv/linux/bits/sigevent-consts.h * sysdeps/unix/sysv/linux/bits/siginfo-consts.h * sysdeps/unix/sysv/linux/bits/types/__sigset_t.h * sysdeps/unix/sysv/linux/bits/types/sigevent_t.h * sysdeps/unix/sysv/linux/bits/types/siginfo_t.h: New system-dependent bits headers. * sysdeps/unix/sysv/linux/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/bits/siginfo-consts-arch.h * sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/ia64/bits/siginfo-consts-arch.h * sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/tile/bits/siginfo-consts-arch.h * sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h: New Linux-only system-dependent bits headers. * signal/bits/types/sig_atomic_t.h * signal/bits/types/sigset_t.h * signal/bits/types/sigval_t.h: New non-system-dependent bits headers. * sysdeps/generic/sigsetops.h * sysdeps/unix/sysv/linux/sigsetops.h: New internal headers. * include/bits/types/sig_atomic_t.h * include/bits/types/sigset_t.h * include/bits/types/sigval_t.h: New wrappers. * signal/sigsetops.h * bits/siginfo.h * bits/sigset.h * sysdeps/unix/sysv/linux/bits/siginfo.h * sysdeps/unix/sysv/linux/bits/sigset.h * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h * sysdeps/unix/sysv/linux/mips/bits/siginfo.h * sysdeps/unix/sysv/linux/s390/bits/siginfo.h * sysdeps/unix/sysv/linux/sparc/bits/siginfo.h * sysdeps/unix/sysv/linux/tile/bits/siginfo.h * sysdeps/unix/sysv/linux/x86/bits/siginfo.h: Deleted. * signal/Makefile, sysdeps/unix/sysv/linux/Makefile: Update lists of installed headers. * posix/bits/types.h: Define __sig_atomic_t here. * signal/signal.h: Use the new bits headers; no need to handle __need_sig_atomic_t nor __need_sigset_t. Don't use __sigmask to define sigmask. * include/signal.h: No need to handle __need_sig_atomic_t nor __need_sigset_t. Don't define __sigemptyset. * io/sys/poll.h, setjmp/setjmp.h * sysdeps/arm/sys/ucontext.h, sysdeps/generic/sys/ucontext.h * sysdeps/i386/sys/ucontext.h, sysdeps/m68k/sys/ucontext.h * sysdeps/mach/hurd/i386/bits/sigcontext.h * sysdeps/mips/sys/ucontext.h, sysdeps/powerpc/novmxsetjmp.h * sysdeps/pthread/bits/sigthread.h * sysdeps/unix/sysv/linux/hppa/sys/ucontext.h * sysdeps/unix/sysv/linux/m68k/sys/ucontext.h * sysdeps/unix/sysv/linux/mips/sys/ucontext.h * sysdeps/unix/sysv/linux/nios2/sys/ucontext.h * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h * sysdeps/unix/sysv/linux/s390/sys/ucontext.h * sysdeps/unix/sysv/linux/sh/sys/ucontext.h * sysdeps/unix/sysv/linux/sparc/sys/ucontext.h * sysdeps/unix/sysv/linux/tile/sys/ucontext.h * sysdeps/unix/sysv/linux/x86/sys/ucontext.h: Use bits/types/__sigset_t.h. * misc/sys/select.h, posix/spawn.h * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h * sysdeps/unix/sysv/linux/sys/epoll.h * sysdeps/unix/sysv/linux/sys/signalfd.h: Use bits/types/sigset_t.h. * resolv/netdb.h, rt/mqueue.h: Use bits/types/sigevent_t.h. * rt/aio.h: Use bits/types/sigevent_t.h and bits/sigevent-consts.h. * socket/sys/socket.h: Don't include bits/sigset.h. * login/utmp_file.c, shadow/lckpwdf.c, signal/sigandset.c * signal/sigisempty.c, stdlib/abort.c, sysdeps/posix/profil.c * sysdeps/posix/sigignore.c, sysdeps/posix/sigintr.c * sysdeps/posix/signal.c, sysdeps/posix/sigset.c * sysdeps/posix/sprofil.c, sysdeps/posix/sysv_signal.c * sysdeps/unix/sysv/linux/nptl-signals.h: Include sigsetops.h. * signal/sigaddset.c, signal/sigandset.c, signal/sigdelset.c * signal/sigorset.c, stdlib/abort.c, sysdeps/posix/sigignore.c * sysdeps/posix/signal.c, sysdeps/posix/sigset.c: __sigaddset, __sigandset, __sigdelset, __sigemptyset, __sigorset now return no value. * signal/sigaddset.c, signal/sigdelset.c, signal/sigismem.c Include <errno.h>, <signal.h>, and <sigsetops.h> instead of "sigsetops.h". * signal/sigsetops.c: Explicitly define __sigismember, __sigaddset, and __sigdelset as compatibility symbols. * signal/Versions: Correct commentary on __sigpause, __sigaddset, __sigdelset, __sigismember. * inet/rcmd.c: Include sigsetops.h. Convert old code using __sigblock/__sigsetmask to use __sigprocmask and friends.
		
			
				
	
	
		
			129 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			129 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* `fd_set' type and related macros, and `select'/`pselect' declarations.
 | |
|    Copyright (C) 1996-2017 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/types/sigset_t.h>
 | |
| 
 | |
| /* 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 */
 |