mirror of
git://sourceware.org/git/glibc.git
synced 2025-01-30 12:31:53 +08: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.
147 lines
5.1 KiB
C
147 lines
5.1 KiB
C
/* Copyright (C) 1991-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 Standard: 3.2.1 Wait for Process Termination <sys/wait.h>
|
|
*/
|
|
|
|
#ifndef _SYS_WAIT_H
|
|
#define _SYS_WAIT_H 1
|
|
|
|
#include <features.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#include <signal.h>
|
|
|
|
/* These macros could also be defined in <stdlib.h>. */
|
|
#if !defined _STDLIB_H || (!defined __USE_XOPEN && !defined __USE_XOPEN2K8)
|
|
/* This will define the `W*' macros for the flag
|
|
bits to `waitpid', `wait3', and `wait4'. */
|
|
# include <bits/waitflags.h>
|
|
|
|
/* This will define all the `__W*' macros. */
|
|
# include <bits/waitstatus.h>
|
|
|
|
# define WEXITSTATUS(status) __WEXITSTATUS (status)
|
|
# define WTERMSIG(status) __WTERMSIG (status)
|
|
# define WSTOPSIG(status) __WSTOPSIG (status)
|
|
# define WIFEXITED(status) __WIFEXITED (status)
|
|
# define WIFSIGNALED(status) __WIFSIGNALED (status)
|
|
# define WIFSTOPPED(status) __WIFSTOPPED (status)
|
|
# ifdef __WIFCONTINUED
|
|
# define WIFCONTINUED(status) __WIFCONTINUED (status)
|
|
# endif
|
|
#endif /* <stdlib.h> not included. */
|
|
|
|
#ifdef __USE_MISC
|
|
# define WCOREFLAG __WCOREFLAG
|
|
# define WCOREDUMP(status) __WCOREDUMP (status)
|
|
# define W_EXITCODE(ret, sig) __W_EXITCODE (ret, sig)
|
|
# define W_STOPCODE(sig) __W_STOPCODE (sig)
|
|
#endif
|
|
|
|
/* The following values are used by the `waitid' function. */
|
|
#if defined __USE_XOPEN || defined __USE_XOPEN2K8
|
|
typedef enum
|
|
{
|
|
P_ALL, /* Wait for any child. */
|
|
P_PID, /* Wait for specified process. */
|
|
P_PGID /* Wait for members of process group. */
|
|
} idtype_t;
|
|
#endif
|
|
|
|
|
|
/* Wait for a child to die. When one does, put its status in *STAT_LOC
|
|
and return its process ID. For errors, return (pid_t) -1.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern __pid_t wait (int *__stat_loc);
|
|
|
|
#ifdef __USE_MISC
|
|
/* Special values for the PID argument to `waitpid' and `wait4'. */
|
|
# define WAIT_ANY (-1) /* Any process. */
|
|
# define WAIT_MYPGRP 0 /* Any process in my process group. */
|
|
#endif
|
|
|
|
/* Wait for a child matching PID to die.
|
|
If PID is greater than 0, match any process whose process ID is PID.
|
|
If PID is (pid_t) -1, match any process.
|
|
If PID is (pid_t) 0, match any process with the
|
|
same process group as the current process.
|
|
If PID is less than -1, match any process whose
|
|
process group is the absolute value of PID.
|
|
If the WNOHANG bit is set in OPTIONS, and that child
|
|
is not already dead, return (pid_t) 0. If successful,
|
|
return PID and store the dead child's status in STAT_LOC.
|
|
Return (pid_t) -1 for errors. If the WUNTRACED bit is
|
|
set in OPTIONS, return status for stopped children; otherwise don't.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern __pid_t waitpid (__pid_t __pid, int *__stat_loc, int __options);
|
|
|
|
#if defined __USE_XOPEN || defined __USE_XOPEN2K8
|
|
# ifndef __id_t_defined
|
|
# include <bits/types.h>
|
|
typedef __id_t id_t;
|
|
# define __id_t_defined
|
|
# endif
|
|
|
|
# include <bits/types/siginfo_t.h>
|
|
|
|
/* Wait for a childing matching IDTYPE and ID to change the status and
|
|
place appropriate information in *INFOP.
|
|
If IDTYPE is P_PID, match any process whose process ID is ID.
|
|
If IDTYPE is P_PGID, match any process whose process group is ID.
|
|
If IDTYPE is P_ALL, match any process.
|
|
If the WNOHANG bit is set in OPTIONS, and that child
|
|
is not already dead, clear *INFOP and return 0. If successful, store
|
|
exit code and status in *INFOP.
|
|
|
|
This function is a cancellation point and therefore not marked with
|
|
__THROW. */
|
|
extern int waitid (idtype_t __idtype, __id_t __id, siginfo_t *__infop,
|
|
int __options);
|
|
#endif
|
|
|
|
#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
|
|
/* This being here makes the prototypes valid whether or not
|
|
we have already included <sys/resource.h> to define `struct rusage'. */
|
|
struct rusage;
|
|
|
|
/* Wait for a child to exit. When one does, put its status in *STAT_LOC and
|
|
return its process ID. For errors return (pid_t) -1. If USAGE is not
|
|
nil, store information about the child's resource usage there. If the
|
|
WUNTRACED bit is set in OPTIONS, return status for stopped children;
|
|
otherwise don't. */
|
|
extern __pid_t wait3 (int *__stat_loc, int __options,
|
|
struct rusage * __usage) __THROWNL;
|
|
#endif
|
|
|
|
#ifdef __USE_MISC
|
|
/* PID is like waitpid. Other args are like wait3. */
|
|
extern __pid_t wait4 (__pid_t __pid, int *__stat_loc, int __options,
|
|
struct rusage *__usage) __THROWNL;
|
|
#endif /* Use misc. */
|
|
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/wait.h */
|