public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Implement waitpid in terms of wait4
@ 2019-12-19 19:11 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2019-12-19 19:11 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=848791557bc4dbf783b03f2b8af77f71c909ed57
commit 848791557bc4dbf783b03f2b8af77f71c909ed57
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed Nov 13 17:57:00 2019 -0300
Implement waitpid in terms of wait4
This also consolidate all waitpid implementations.
Checked on x86_64-linux-gnu.
Diff:
---
include/sys/wait.h | 1 +
posix/wait4.c | 1 +
posix/waitpid.c | 13 ++----------
sysdeps/mach/hurd/wait4.c | 1 +
sysdeps/unix/bsd/waitpid.c | 42 ---------------------------------------
sysdeps/unix/sysv/linux/wait4.c | 1 +
sysdeps/unix/sysv/linux/waitpid.c | 34 -------------------------------
7 files changed, 6 insertions(+), 87 deletions(-)
diff --git a/include/sys/wait.h b/include/sys/wait.h
index 5ac9cd6..39a327f 100644
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@@ -15,5 +15,6 @@ extern __pid_t __wait3 (int *__stat_loc,
extern __pid_t __wait4 (__pid_t __pid, int *__stat_loc,
int __options, struct rusage *__usage)
attribute_hidden;
+libc_hidden_proto (__wait4);
#endif
#endif
diff --git a/posix/wait4.c b/posix/wait4.c
index eb4f7fb..76cc590 100644
--- a/posix/wait4.c
+++ b/posix/wait4.c
@@ -27,4 +27,5 @@ __wait4 (__pid_t pid, int *stat_loc, int options, struct rusage *usage)
}
stub_warning (wait4)
+libc_hidden_def (__wait4)
weak_alias (__wait4, wait4)
diff --git a/posix/waitpid.c b/posix/waitpid.c
index adae039..214c564 100644
--- a/posix/waitpid.c
+++ b/posix/waitpid.c
@@ -16,8 +16,8 @@
<https://www.gnu.org/licenses/>. */
#include <errno.h>
+#include <stdlib.h>
#include <sys/wait.h>
-#include <sys/types.h>
/* Wait for a child matching PID to die.
@@ -35,16 +35,7 @@
pid_t
__waitpid (pid_t pid, int *stat_loc, int options)
{
- if ((options & ~(WNOHANG|WUNTRACED)) != 0)
- {
- __set_errno (EINVAL);
- return (pid_t) -1;
- }
-
- __set_errno (ENOSYS);
- return (pid_t) -1;
+ return __wait4 (pid, stat_loc, options, NULL);
}
libc_hidden_def (__waitpid)
weak_alias (__waitpid, waitpid)
-
-stub_warning (waitpid)
diff --git a/sysdeps/mach/hurd/wait4.c b/sysdeps/mach/hurd/wait4.c
index 78ad33e..a8b5c0f 100644
--- a/sysdeps/mach/hurd/wait4.c
+++ b/sysdeps/mach/hurd/wait4.c
@@ -50,4 +50,5 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage)
}
}
+libc_hidden_def (__wait4)
weak_alias (__wait4, wait4)
diff --git a/sysdeps/unix/bsd/waitpid.c b/sysdeps/unix/bsd/waitpid.c
deleted file mode 100644
index 679d45d..0000000
--- 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 c97e212..1265f7d 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 d35aac0..0000000
--- 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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-12-19 19:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-19 19:11 [glibc] Implement waitpid in terms of wait4 Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).