mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-05 03:01:05 +00:00
a992f506ff
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.
139 lines
4.3 KiB
C
139 lines
4.3 KiB
C
/* Copyright (C) 2002-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/>. */
|
|
|
|
#ifndef _SYS_EPOLL_H
|
|
#define _SYS_EPOLL_H 1
|
|
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <bits/types/sigset_t.h>
|
|
|
|
/* Get the platform-dependent flags. */
|
|
#include <bits/epoll.h>
|
|
|
|
#ifndef __EPOLL_PACKED
|
|
# define __EPOLL_PACKED
|
|
#endif
|
|
|
|
|
|
enum EPOLL_EVENTS
|
|
{
|
|
EPOLLIN = 0x001,
|
|
#define EPOLLIN EPOLLIN
|
|
EPOLLPRI = 0x002,
|
|
#define EPOLLPRI EPOLLPRI
|
|
EPOLLOUT = 0x004,
|
|
#define EPOLLOUT EPOLLOUT
|
|
EPOLLRDNORM = 0x040,
|
|
#define EPOLLRDNORM EPOLLRDNORM
|
|
EPOLLRDBAND = 0x080,
|
|
#define EPOLLRDBAND EPOLLRDBAND
|
|
EPOLLWRNORM = 0x100,
|
|
#define EPOLLWRNORM EPOLLWRNORM
|
|
EPOLLWRBAND = 0x200,
|
|
#define EPOLLWRBAND EPOLLWRBAND
|
|
EPOLLMSG = 0x400,
|
|
#define EPOLLMSG EPOLLMSG
|
|
EPOLLERR = 0x008,
|
|
#define EPOLLERR EPOLLERR
|
|
EPOLLHUP = 0x010,
|
|
#define EPOLLHUP EPOLLHUP
|
|
EPOLLRDHUP = 0x2000,
|
|
#define EPOLLRDHUP EPOLLRDHUP
|
|
EPOLLEXCLUSIVE = 1u << 28,
|
|
#define EPOLLEXCLUSIVE EPOLLEXCLUSIVE
|
|
EPOLLWAKEUP = 1u << 29,
|
|
#define EPOLLWAKEUP EPOLLWAKEUP
|
|
EPOLLONESHOT = 1u << 30,
|
|
#define EPOLLONESHOT EPOLLONESHOT
|
|
EPOLLET = 1u << 31
|
|
#define EPOLLET EPOLLET
|
|
};
|
|
|
|
|
|
/* Valid opcodes ( "op" parameter ) to issue to epoll_ctl(). */
|
|
#define EPOLL_CTL_ADD 1 /* Add a file descriptor to the interface. */
|
|
#define EPOLL_CTL_DEL 2 /* Remove a file descriptor from the interface. */
|
|
#define EPOLL_CTL_MOD 3 /* Change file descriptor epoll_event structure. */
|
|
|
|
|
|
typedef union epoll_data
|
|
{
|
|
void *ptr;
|
|
int fd;
|
|
uint32_t u32;
|
|
uint64_t u64;
|
|
} epoll_data_t;
|
|
|
|
struct epoll_event
|
|
{
|
|
uint32_t events; /* Epoll events */
|
|
epoll_data_t data; /* User data variable */
|
|
} __EPOLL_PACKED;
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Creates an epoll instance. Returns an fd for the new instance.
|
|
The "size" parameter is a hint specifying the number of file
|
|
descriptors to be associated with the new instance. The fd
|
|
returned by epoll_create() should be closed with close(). */
|
|
extern int epoll_create (int __size) __THROW;
|
|
|
|
/* Same as epoll_create but with an FLAGS parameter. The unused SIZE
|
|
parameter has been dropped. */
|
|
extern int epoll_create1 (int __flags) __THROW;
|
|
|
|
|
|
/* Manipulate an epoll instance "epfd". Returns 0 in case of success,
|
|
-1 in case of error ( the "errno" variable will contain the
|
|
specific error code ) The "op" parameter is one of the EPOLL_CTL_*
|
|
constants defined above. The "fd" parameter is the target of the
|
|
operation. The "event" parameter describes which events the caller
|
|
is interested in and any associated user data. */
|
|
extern int epoll_ctl (int __epfd, int __op, int __fd,
|
|
struct epoll_event *__event) __THROW;
|
|
|
|
|
|
/* Wait for events on an epoll instance "epfd". Returns the number of
|
|
triggered events returned in "events" buffer. Or -1 in case of
|
|
error with the "errno" variable set to the specific error code. The
|
|
"events" parameter is a buffer that will contain triggered
|
|
events. The "maxevents" is the maximum number of events to be
|
|
returned ( usually size of "events" ). The "timeout" parameter
|
|
specifies the maximum wait time in milliseconds (-1 == infinite).
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern int epoll_wait (int __epfd, struct epoll_event *__events,
|
|
int __maxevents, int __timeout);
|
|
|
|
|
|
/* Same as epoll_wait, but the thread's signal mask is temporarily
|
|
and atomically replaced with the one provided as parameter.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern int epoll_pwait (int __epfd, struct epoll_event *__events,
|
|
int __maxevents, int __timeout,
|
|
const __sigset_t *__ss);
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/epoll.h */
|