From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 68130 invoked by alias); 31 Dec 2019 10:47:09 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 68113 invoked by uid 9299); 31 Dec 2019 10:47:09 -0000 Date: Tue, 31 Dec 2019 10:47:00 -0000 Message-ID: <20191231104709.68112.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/fw/builtin-syscalls-4] Consolidate wait3 implementations X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/fw/builtin-syscalls-4 X-Git-Oldrev: 848791557bc4dbf783b03f2b8af77f71c909ed57 X-Git-Newrev: 442d9c9c677804287a54b10d5fa5e58a9cdd338d X-SW-Source: 2019-q4/txt/msg00682.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=442d9c9c677804287a54b10d5fa5e58a9cdd338d commit 442d9c9c677804287a54b10d5fa5e58a9cdd338d Author: Adhemerval Zanella Date: Thu Nov 14 11:37:10 2019 -0300 Consolidate wait3 implementations The generic one calls wait4. Checked on x86_64-linux-gnu. Diff: --- posix/wait3.c | 11 +---------- sysdeps/posix/wait3.c | 39 --------------------------------------- sysdeps/unix/bsd/wait3.c | 33 --------------------------------- sysdeps/unix/sysv/linux/wait3.c | 1 - 4 files changed, 1 insertion(+), 83 deletions(-) diff --git a/posix/wait3.c b/posix/wait3.c index 6b6e3a5..9d7141f 100644 --- a/posix/wait3.c +++ b/posix/wait3.c @@ -15,7 +15,6 @@ License along with the GNU C Library; if not, see . */ -#include #include #include @@ -27,15 +26,7 @@ pid_t __wait3 (int *stat_loc, int options, struct rusage *usage) { - if ((options & ~(WNOHANG|WUNTRACED)) != 0) - { - __set_errno (EINVAL); - return (pid_t) -1; - } - - __set_errno (ENOSYS); - return (pid_t) -1; + return __wait4 (WAIT_ANY, stat_loc, options, usage); } -stub_warning (wait3) weak_alias (__wait3, wait3) diff --git a/sysdeps/posix/wait3.c b/sysdeps/posix/wait3.c deleted file mode 100644 index daba36c..0000000 --- a/sysdeps/posix/wait3.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 1992-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 - . */ - -#include -#include -#include -#include - -/* 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 (as a `struct rusage') - there. If the WUNTRACED bit is set in OPTIONS, return status for stopped - children; otherwise don't. */ -pid_t -__wait3 (int *stat_loc, int options, struct rusage *usage) -{ - if (usage != NULL) - { - __set_errno (ENOSYS); - return (pid_t) -1; - } - return __waitpid (WAIT_ANY, stat_loc, options); -} - -weak_alias (__wait3, wait3) diff --git a/sysdeps/unix/bsd/wait3.c b/sysdeps/unix/bsd/wait3.c deleted file mode 100644 index d7fa7e4..0000000 --- a/sysdeps/unix/bsd/wait3.c +++ /dev/null @@ -1,33 +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 - . */ - -#include -#include -#include - -/* 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 (as a `struct rusage') - there. If the WUNTRACED bit is set in OPTIONS, return status for stopped - children; otherwise don't. */ -pid_t -__wait3 (int *stat_loc, int options, struct rusage *usage) -{ - return __wait4 (WAIT_ANY, stat_loc, options, usage); -} - -weak_alias (__wait3, wait3) diff --git a/sysdeps/unix/sysv/linux/wait3.c b/sysdeps/unix/sysv/linux/wait3.c deleted file mode 100644 index 2ff027f..0000000 --- a/sysdeps/unix/sysv/linux/wait3.c +++ /dev/null @@ -1 +0,0 @@ -#include