From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Cc: Alistair Francis <alistair.francis@wdc.com>, alistair23@gmail.com
Subject: [PATCH 4/7] Implement wait in terms of waitpid
Date: Thu, 14 Nov 2019 11:47:01 -0300 [thread overview]
Message-ID: <20191114144704.19002-4-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20191114144704.19002-1-adhemerval.zanella@linaro.org>
The posix implementation is used as default and both bsd and linux
version are removed. It simplifies the implementation for
architectures that does not provide either __NR_waitpid or
__NR_wait4.
Checked on x86_64-linux-gnu and powerpc64le-linux-gnu.
---
posix/wait.c | 6 +-----
sysdeps/posix/wait.c | 30 -----------------------------
sysdeps/unix/bsd/wait.c | 32 -------------------------------
sysdeps/unix/sysv/linux/wait.c | 35 ----------------------------------
4 files changed, 1 insertion(+), 102 deletions(-)
delete mode 100644 sysdeps/posix/wait.c
delete mode 100644 sysdeps/unix/bsd/wait.c
delete mode 100644 sysdeps/unix/sysv/linux/wait.c
diff --git a/posix/wait.c b/posix/wait.c
index 0acd1e4926..908e15030a 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, (int *) 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)
--
2.17.1
next prev parent reply other threads:[~2019-11-14 14:47 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-14 14:46 [PATCH 1/7] Remove __waitpid_nocancel Adhemerval Zanella
2019-11-14 14:46 ` [PATCH 2/7] nptl: Move wait implementation to libc Adhemerval Zanella
2019-11-14 14:47 ` [PATCH 3/7] nptl: Move waitpid " Adhemerval Zanella
2019-11-14 14:47 ` Adhemerval Zanella [this message]
2019-11-14 14:47 ` [PATCH 5/7] linux: Use waitid on wait4 if __NR_wait4 is not defined Adhemerval Zanella
2019-11-15 18:27 ` Alistair Francis
2019-11-21 17:48 ` Adhemerval Zanella
2019-11-21 17:52 ` Adhemerval Zanella
2019-11-21 18:41 ` Alistair Francis
2019-11-22 12:15 ` Adhemerval Zanella
2019-11-22 20:00 ` Alistair Francis
2019-11-25 12:39 ` Adhemerval Zanella
2019-11-25 12:42 ` Adhemerval Zanella
2019-12-03 18:58 ` Alistair Francis
2019-12-03 19:18 ` Adhemerval Zanella
2019-11-14 14:47 ` [PATCH 6/7] Implement waitpid in terms of wait4 Adhemerval Zanella
2019-11-14 14:47 ` [PATCH 7/7] Consolidate wait3 implementations Adhemerval Zanella
2019-11-14 15:44 ` Alistair Francis
2019-12-19 15:33 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191114144704.19002-4-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).