summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-11-13 13:30:46 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-12-19 16:11:09 -0300
commitc5cbdacb8acec54e140c879393c8c7dd658c3488 (patch)
tree6fc81c727cf21a1952e6571e50847220babba760
parentb633cdff2cd7259baea4d115cce0a818542f6f98 (diff)
downloadglibc-c5cbdacb8acec54e140c879393c8c7dd658c3488.tar.gz
glibc-c5cbdacb8acec54e140c879393c8c7dd658c3488.tar.xz
glibc-c5cbdacb8acec54e140c879393c8c7dd658c3488.zip
Implement wait in terms of waitpid
The POSIX implementation is used as default and both BSD and Linux
version are removed.  It simplifies the implementation for
architectures that do not provide either __NR_waitpid or
__NR_wait4.

Checked on x86_64-linux-gnu and powerpc64le-linux-gnu.
-rw-r--r--posix/wait.c6
-rw-r--r--sysdeps/posix/wait.c30
-rw-r--r--sysdeps/unix/bsd/wait.c32
-rw-r--r--sysdeps/unix/sysv/linux/wait.c35
4 files changed, 1 insertions, 102 deletions
diff --git a/posix/wait.c b/posix/wait.c
index 0acd1e4926..57064726f0 100644
--- a/posix/wait.c
+++ b/posix/wait.c
@@ -16,16 +16,12 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sys/wait.h>
-#include <errno.h>
 
 /* 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.  */
 __pid_t
 __wait (int *stat_loc)
 {
-  __set_errno (ENOSYS);
-  return -1;
+  return __waitpid (WAIT_ANY, stat_loc, 0);
 }
-stub_warning (wait)
-
 weak_alias (__wait, wait)
diff --git a/sysdeps/posix/wait.c b/sysdeps/posix/wait.c
deleted file mode 100644
index 573aa47a6d..0000000000
--- a/sysdeps/posix/wait.c
+++ /dev/null
@@ -1,30 +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 <sys/wait.h>
-
-
-/* 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.  */
-__pid_t
-__libc_wait (int *stat_loc)
-{
-  return __waitpid (WAIT_ANY, (int *) stat_loc, 0);
-}
-
-weak_alias (__libc_wait, __wait)
-weak_alias (__libc_wait, wait)
diff --git a/sysdeps/unix/bsd/wait.c b/sysdeps/unix/bsd/wait.c
deleted file mode 100644
index 3207d96330..0000000000
--- a/sysdeps/unix/bsd/wait.c
+++ /dev/null
@@ -1,32 +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 <sys/wait.h>
-#include <errno.h>
-#include <sys/resource.h>
-#include <stddef.h>
-
-/* 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.  */
-__pid_t
-__libc_wait (int *stat_loc)
-{
-  return __wait4 (WAIT_ANY, stat_loc, 0, (struct rusage *) NULL);
-}
-
-weak_alias (__libc_wait, __wait)
-weak_alias (__libc_wait, wait)
diff --git a/sysdeps/unix/sysv/linux/wait.c b/sysdeps/unix/sysv/linux/wait.c
deleted file mode 100644
index c2385c752e..0000000000
--- a/sysdeps/unix/sysv/linux/wait.c
+++ /dev/null
@@ -1,35 +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 <sys/wait.h>
-#include <errno.h>
-#include <sys/resource.h>
-#include <stddef.h>
-#include <sysdep-cancel.h>
-
-/* 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.  */
-pid_t
-__libc_wait (int *stat_loc)
-{
-  pid_t result = SYSCALL_CANCEL (wait4, WAIT_ANY, stat_loc, 0,
-				 (struct rusage *) NULL);
-  return result;
-}
-
-weak_alias (__libc_wait, __wait)
-weak_alias (__libc_wait, wait)