diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-11-13 17:57:00 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-12-19 16:11:09 -0300 |
commit | 848791557bc4dbf783b03f2b8af77f71c909ed57 (patch) | |
tree | 19e9be29ab32a7bc648506bef0dd7020e5e49522 /sysdeps/unix | |
parent | 9b2cf9482a9397c4711c9e7f42f8d718b6306bdc (diff) | |
download | glibc-848791557bc4dbf783b03f2b8af77f71c909ed57.tar.gz |
Implement waitpid in terms of wait4
This also consolidate all waitpid implementations.
Checked on x86_64-linux-gnu.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r-- | sysdeps/unix/bsd/waitpid.c | 42 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/wait4.c | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/waitpid.c | 34 |
3 files changed, 1 insertions, 76 deletions
diff --git a/sysdeps/unix/bsd/waitpid.c b/sysdeps/unix/bsd/waitpid.c deleted file mode 100644 index 679d45d3dd..0000000000 --- a/sysdeps/unix/bsd/waitpid.c +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (C) 1991-2019 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 - <https://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <sys/wait.h> -#include <sys/types.h> -#include <stddef.h> - -/* 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. */ -pid_t -__waitpid (pid_t pid, int *stat_loc, int options) -{ - return __wait4 (pid, stat_loc, options, NULL); -} - -libc_hidden_def (__waitpid) -weak_alias (__waitpid, waitpid) diff --git a/sysdeps/unix/sysv/linux/wait4.c b/sysdeps/unix/sysv/linux/wait4.c index c97e212b54..1265f7da8d 100644 --- a/sysdeps/unix/sysv/linux/wait4.c +++ b/sysdeps/unix/sysv/linux/wait4.c @@ -81,4 +81,5 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) # error "The kernel ABI does not provide a way to implement wait4" #endif } +libc_hidden_def (__wait4); weak_alias (__wait4, wait4) diff --git a/sysdeps/unix/sysv/linux/waitpid.c b/sysdeps/unix/sysv/linux/waitpid.c deleted file mode 100644 index d35aac01bc..0000000000 --- a/sysdeps/unix/sysv/linux/waitpid.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Linux waitpid syscall implementation. - Copyright (C) 1991-2019 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 - <https://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <sysdep-cancel.h> -#include <stdlib.h> -#include <sys/wait.h> - -__pid_t -__waitpid (__pid_t pid, int *stat_loc, int options) -{ -#ifdef __NR_waitpid - return SYSCALL_CANCEL (waitpid, pid, stat_loc, options); -#else - return SYSCALL_CANCEL (wait4, pid, stat_loc, options, NULL); -#endif -} -libc_hidden_def (__waitpid) -weak_alias (__waitpid, waitpid) |