From patchwork Thu Nov 14 14:47:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 179441 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11156357ilf; Thu, 14 Nov 2019 06:48:20 -0800 (PST) X-Google-Smtp-Source: APXvYqy/uKbr5/NhHjpt93ZO43D3krbbVIBV7E0tYWA1rOhZXCK3ypTBuUQFlQJaW3mQrgcKSDNG X-Received: by 2002:aa7:c453:: with SMTP id n19mr1724899edr.103.1573742900740; Thu, 14 Nov 2019 06:48:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573742900; cv=none; d=google.com; s=arc-20160816; b=JZ0fgb9DanK5PsPmyCrLA9TIwUl4mOtjpQF+2UCMVyMj3gpMqksA1/mqwv8zWA9+ES QrOdl56c415XT6drXE03Gq/aoLHvpu9Wb/K48VNTbhD4KpnFjwLwMWFPsKJPysK1kP3q Ak4YUswnXljUAuy7nkJJunthwrM8GIo7e3iqyMlQNgRNgHbIBZTh582/4PM7IJHQLDo/ hH/pKo2/EXENMaZm1+Df05opeI4KL/clQ83vtz6IjQDPAG0/CnOmMTGhfTfyDhEzBkpk VTQ+RtJS8YjsA+nfAoYvW0DXMOBmU0oO0mwiH4Sl94toXcRpsCXvvT4ULZmibzY1ssLT yHjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=H4v64pG13DBzvoI8jjVF2zcWNVeJEMz/NHYANkY1GU4=; b=h8gvoQQMA5RiBHmZZZUV+xnKHxzOnbjsiPH3aiprfNjXfiBl0BU+rpicgjvzz/xRsG 2MilyJ+CVXLN7IkHvN4GF3AptFqos9nCa0qM1xODyhkpkpIXwl9AxK0fImkM/3GIHLDj tcvFHP3W97uZLZ2nbTXdJIi3hwEGrNTF21RCPyjUjJKh9NjlwMNiNFJwjFrLwdxIJlwr zCOQkMjX0L058iC2k50YeW4jYeGHTMgUiY0eTQcP9EO5jgqELINzUmCPnlG2j2HJksJV 2wEfVEDgGsWNXjipu8lE5wXWlCqYxXx3xfXIaOfxhsWTa/ZaGij3AsgJTTmjwfM3ga4i 6KDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=laKamEAx; dkim=pass header.i=@linaro.org header.s=google header.b=tZv5LVwK; spf=pass (google.com: domain of libc-alpha-return-107085-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107085-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id s1si4042405edx.188.2019.11.14.06.48.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 06:48:20 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-107085-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=laKamEAx; dkim=pass header.i=@linaro.org header.s=google header.b=tZv5LVwK; spf=pass (google.com: domain of libc-alpha-return-107085-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107085-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=YuBbrUyP+QpRU/+Z09wd9K7jER+1heq yi8lEi3UXTEtdQGdCrhCeoTWF+4kAJ4fKzcYZ6dnP3sfUrp4cuBj1az+h+jTrU7X mrfDfKrc05l5mBqKa92GbXAW9OMz+4nkuO5bvMe0XJUxpC6d0okSiniqPXPrDbpy BDdNhZ7KxorE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=Dn9eYNnuHmlapC9APCFL3T631Ek=; b=laKam EAxxRH6GUBZeiHWUf9lj1bbDvlyY+VsGtrYWzV3nxhS7CdnN4Vqa6unbOfV3vYHa wLE3E+15LtxDV2z5bcbqlCCWqsV+dLWlt/98y0dwp58/k+5kiaSTeIEil1WyNeFp wNDxpLkhos/H3s4UxrHBAlBFL6b0bybRiFaNBc= Received: (qmail 30173 invoked by alias); 14 Nov 2019 14:47:23 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 30086 invoked by uid 89); 14 Nov 2019 14:47:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qt1-f195.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=H4v64pG13DBzvoI8jjVF2zcWNVeJEMz/NHYANkY1GU4=; b=tZv5LVwKElTTnghkDW5lG4oQ4skQqAsMXdQSgV9VhCIvhwxXUPyTR1fzeFXkHsh3MY LpkX04r9SsnK3/l9tKuypPxZD6841GkBLzP2WbXlNQu9FqPJmpyRQKgS5hUUYM3Uwxvb XBOHMvcE+DbvTF6muDssvE9x3I8n6tmmaCUQLWS2dFBh6lKXWjOF0YJvBqUf2fFL0xPo Dj9ttBM6PXFXbouGu1yNhAtbvMpQ2U3yMxY/biTsN+AsJjN6LazphuVpZAKZPDhJsTj9 HmqkYcQ0n8/pQWBzmobdPPddzR08tmIWiCs1ZQgvtThjm6Bif6O9EP7ProNPmlsFYHdH oLsg== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Alistair Francis , alistair23@gmail.com Subject: [PATCH 6/7] Implement waitpid in terms of wait4 Date: Thu, 14 Nov 2019 11:47:03 -0300 Message-Id: <20191114144704.19002-6-adhemerval.zanella@linaro.org> In-Reply-To: <20191114144704.19002-1-adhemerval.zanella@linaro.org> References: <20191114144704.19002-1-adhemerval.zanella@linaro.org> This also consolidate all waitpid implementations. Checked on x86_64-linux-gnu. --- include/sys/wait.h | 1 + posix/wait4.c | 2 +- posix/waitpid.c | 34 ++++++------------------- sysdeps/mach/hurd/wait4.c | 2 +- sysdeps/unix/bsd/waitpid.c | 42 ------------------------------- sysdeps/unix/sysv/linux/wait4.c | 1 + sysdeps/unix/sysv/linux/waitpid.c | 34 ------------------------- 7 files changed, 11 insertions(+), 105 deletions(-) delete mode 100644 sysdeps/unix/bsd/waitpid.c delete mode 100644 sysdeps/unix/sysv/linux/waitpid.c -- 2.17.1 diff --git a/include/sys/wait.h b/include/sys/wait.h index 5ac9cd6ca6..39a327f6b2 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 eb4f7fb6de..5857b4e7c1 100644 --- a/posix/wait4.c +++ b/posix/wait4.c @@ -26,5 +26,5 @@ __wait4 (__pid_t pid, int *stat_loc, int options, struct rusage *usage) return (pid_t) -1; } stub_warning (wait4) - +libc_hidden_def (__wait4) weak_alias (__wait4, wait4) diff --git a/posix/waitpid.c b/posix/waitpid.c index adae03918a..0490c37316 100644 --- a/posix/waitpid.c +++ b/posix/waitpid.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-2019 Free Software Foundation, Inc. +/* Wait for process to change state. + 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 @@ -16,35 +17,14 @@ . */ #include +#include +#include #include -#include - -/* 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) +__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 78ad33e8f5..a0137482c4 100644 --- a/sysdeps/mach/hurd/wait4.c +++ b/sysdeps/mach/hurd/wait4.c @@ -49,5 +49,5 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) return (pid_t) __hurd_fail (err); } } - +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 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 - . */ - -#include -#include -#include -#include - -/* 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 d09917c7ff..203deb7730 100644 --- a/sysdeps/unix/sysv/linux/wait4.c +++ b/sysdeps/unix/sysv/linux/wait4.c @@ -85,4 +85,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 - . */ - -#include -#include -#include -#include - -__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)