From patchwork Thu Nov 14 14:47:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 179442 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11156548ilf; Thu, 14 Nov 2019 06:48:30 -0800 (PST) X-Google-Smtp-Source: APXvYqyUSpWzE8hPoBspIcbegWb+/K7qDWoz6UObvcAZv6BzWimAhK4t/50xVoma2qxfuDE+99WF X-Received: by 2002:a17:906:5786:: with SMTP id k6mr8819335ejq.294.1573742910216; Thu, 14 Nov 2019 06:48:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573742910; cv=none; d=google.com; s=arc-20160816; b=n2joAkdifEqgpVrBzANta831TfDdeNkpeC0tNjlPkbUkfaBWCZOzMj9TSk1t76PPgH f4EAaNg87mC8cNhazDB3Qon+D1RqdMuWtpY1Dbalkg5ez9pFSgLIfFJYmPR6Rm3LMn43 dJLdT9yqJdNL2QdgJwibgAobN2uQPpCbr5maZbF+d4CExRWjfkySU/RzIklxt6e5rGon Q7zk8+Ihom1fJDsyhFE28y7uYiEGesvNYUeL0PERGSsD/IICEtjDWafhqO+6DouEKwu2 /7AD9qBBrhjNFbZG0waI6NYQ5H5QJoQ4E1iNCM9l2dvwfumvhNQ3f24z48YvhkyVHh03 e5Ug== 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=iinejSlIt8VuF0soYcV/L+80DhRPCWRE4jMj3imRgUs=; b=kErAdnB77YeuFJtnjjh/E0GYK3v1+U8rZPPHApNq5r7MJkDBmz5MI/gi7WXccGANGr Hu3DK0O7tQHeUKxQxJEoEEVUcohSi96EXwFKtgfRaTjIPnbKeft+loegRUDkzJaa1pH+ OUlv7VBe5Au8BKVrUQRM3HFEhIX067iEr9PBCHosJDoFbhw6aKCBvR/uouqHFJAhFKqi KUaGz1beaUCCdAXya9kLB8Ihed0KMoMKdzAfMiDk2Z+xUyXG703AfsjgtZ2lm65PN2/p rvXV03LRaTwMAWcC+ux5xXuCjeeKCT9xIXVyrhOx4EbcdyPfnlr/mVfGauGgMn5qb4+Z 8nXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=LaTtj8PZ; dkim=pass header.i=@linaro.org header.s=google header.b=JWDEMBdS; spf=pass (google.com: domain of libc-alpha-return-107086-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107086-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 l4si3666718edr.286.2019.11.14.06.48.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 06:48:30 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-107086-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=LaTtj8PZ; dkim=pass header.i=@linaro.org header.s=google header.b=JWDEMBdS; spf=pass (google.com: domain of libc-alpha-return-107086-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107086-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=CDy0pptkj9sbBa+XycFM/DIsEUM+zAo JE5uVybeCzrQ0mofXGQ3ImX5x29he/2k1Klq5DrFgteEXZLCkt1JDmReXbRe7khD Rf4ihrZfL9E8KWzGEswfofRWZLmLn6O23iRcnXAeAlM0ir0CJQ6ufBxjgNVtLjES Be4jnHjEc5w4= 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=irPm7GXNBq++uUv77uuBCyFDVZI=; b=LaTtj 8PZUVscFqrbjlYZLVH9fFMlRYwfoI0rc4loZ8Trah420oFonStONH/Kf8h9FlTyi cVZyx4nGzIWmUVW9I0yLmokfAb37CHSCMfPFmfEtPz5snsCdly86BLmmpdV1itxQ HyHOZQ+F0kojWQXpP4jT/0Yd2Sw+LbhNUXr7sk= Received: (qmail 30373 invoked by alias); 14 Nov 2019 14:47:24 -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 30327 invoked by uid 89); 14 Nov 2019 14:47:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qk1-f196.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=iinejSlIt8VuF0soYcV/L+80DhRPCWRE4jMj3imRgUs=; b=JWDEMBdStWjyAQAbGZHxN1fL60RkZt9sLj8uSUfwmvbZvxL1f9UAuQ5v3i+ruvZxTW 50Wl23AoBIKctlSr1TvUqdINFb0BYgW8t1G+u0R7sH/CHvYESihHNNNtGci3DjAfa21D 6MAqZyxyk4PYLr1PcjAsasdqswAEQwIjXO9al9T3bAJZ6Ut1x8oqYwFcszpbswo1MALU SC9ZYFBGb+gD6NDzq3Wai1UAKpr+c+LD5t+k8C07FkFtd+A3WlTe5Jffrvo493QPprZp zSBV+yrYfrM0TjQ6h80tjPerg7dBwRY7jqQMGobA+UlUm9IuHeMuazATG5lVTIrmO3T+ c3hg== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Alistair Francis , alistair23@gmail.com Subject: [PATCH 7/7] Consolidate wait3 implementations Date: Thu, 14 Nov 2019 11:47:04 -0300 Message-Id: <20191114144704.19002-7-adhemerval.zanella@linaro.org> In-Reply-To: <20191114144704.19002-1-adhemerval.zanella@linaro.org> References: <20191114144704.19002-1-adhemerval.zanella@linaro.org> The generic one calls wait4. Checked on x86_64-linux-gnu. --- posix/wait3.c | 14 +++--------- sysdeps/posix/wait3.c | 39 --------------------------------- sysdeps/unix/bsd/wait3.c | 33 ---------------------------- sysdeps/unix/sysv/linux/wait3.c | 1 - 4 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 sysdeps/posix/wait3.c delete mode 100644 sysdeps/unix/bsd/wait3.c delete mode 100644 sysdeps/unix/sysv/linux/wait3.c -- 2.17.1 diff --git a/posix/wait3.c b/posix/wait3.c index 6b6e3a500d..f0abf24e31 100644 --- a/posix/wait3.c +++ b/posix/wait3.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 @@ -15,7 +16,6 @@ License along with the GNU C Library; if not, see . */ -#include #include #include @@ -27,15 +27,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 daba36c6dc..0000000000 --- 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 d7fa7e4496..0000000000 --- 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 2ff027f0e1..0000000000 --- a/sysdeps/unix/sysv/linux/wait3.c +++ /dev/null @@ -1 +0,0 @@ -#include