From patchwork Tue Feb 18 14:02:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 183596 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp6154020ile; Tue, 18 Feb 2020 06:02:29 -0800 (PST) X-Google-Smtp-Source: APXvYqw2d+WycvTogMQkK4sjdsoTPpa6zDzNp1kQORucOlm+LQsnvyospwQnsUquqnaXC6LzMsIh X-Received: by 2002:a9d:7e90:: with SMTP id m16mr14933564otp.227.1582034549325; Tue, 18 Feb 2020 06:02:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582034549; cv=none; d=google.com; s=arc-20160816; b=FwM9qxd7Kh3tApTYZu4N1kkQ8tjZLSXjhHBurF3zceIctObfJJ+Ew59dEJGOL+9ctr o2cW1SLIt+6aLsdlp4In1TeV5S/JP92fyzUX82J/VVIrGcoFIctxYUJ8AzqD7TZkmXst JzcrN/9p02Pi+nkaiQWzDJawms6C6cCwU8eY7RQutvv/tt94rA7+QyE491q/k9lkBpza rJdGad5J1t+ZDtlU5BAlyyWvu0hHFc3rkjDd2AwfgbjHyW8wrWSP0DHPo6WfLXgTOYBW klk2ieKB9EfRRD4J1rQXmoPiEQyA/J2k1+bzPIqvs6ajBmgVLa41IB05Ll5p3w+eQn6I cQAA== 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: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=Q4Auv/JTCNxpp3lyrWs4HbCN58+/QiP52jt1MovJZGg=; b=KLLJ5ryXBGKQJVXq3VFNZorj4mbJA/+OVI0ZDVOqokrzT7aY1LWIyLEUaXfqBswA00 J8cxXM1fHGQ+MdOS//Lt1rK2MtqGK2tkc/DxC6KL+iBfuUIurZ/rF1q0dVTTHIipVLYS d4DxD5UKZvmAztk2GzwwqOK/119pdWl97GHVQkMCncIy/YFVYrNx8j7XnbVfTZhbZ9kY 9Pw8oM9SiPUo41cAq0s9/E1VVZ5Xdq+1j6DufBUyySV0Zy0uOliVy/CnMKJ1eopkD6bY 2nq3aTtpacWq2FIJXb4WJ8MWnUaLhEPkm/8ss0sWhc1/WXRSioZdgh+z1iLz6lcndURW 6jIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=OY+serfv; dkim=pass header.i=@linaro.org header.s=google header.b="s/GtJ/HB"; spf=pass (google.com: domain of libc-alpha-return-109878-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-109878-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 z15si1812190otm.168.2020.02.18.06.02.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Feb 2020 06:02:28 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-109878-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=OY+serfv; dkim=pass header.i=@linaro.org header.s=google header.b="s/GtJ/HB"; spf=pass (google.com: domain of libc-alpha-return-109878-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-109878-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:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=DXq802KNTFuT6KcET6fV5ONRb+1WJba /pEmsqnbJg639moFxDnm7QDMjx0wfNE91+MToRbPnzETWnCL9yoz62tDEUC4Ohny aclIvgtVB+s48sW78OTRK0VrY/wlnClezFdYETj2blGuJIp8uTtvOUUoSpIIuii5 r/eBqhPpmQ9Q= 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:subject:date:message-id:in-reply-to :references; s=default; bh=lrdqokhHdRNBvt7/mCpqyoVDIJk=; b=OY+se rfvbBwcx7OyIIM7TIOomG4TEDkmOt41btQIKoI/Atw35zHIraPARPR0FXnz3FSFS 7oQn4EkulGbgBgNClKc1hy1z5GF5v9m3EXGWoeBD+7ndhUY7xydOeD6Zx2nbH9Q7 pdjfuRJ/EPkCvWI/iF5VNnYyhixtHxwJgcUAlI= Received: (qmail 58313 invoked by alias); 18 Feb 2020 14:02:18 -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 58302 invoked by uid 89); 18 Feb 2020 14:02:17 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.0 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=Technical X-HELO: mail-qt1-f196.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=Q4Auv/JTCNxpp3lyrWs4HbCN58+/QiP52jt1MovJZGg=; b=s/GtJ/HBFH53kjFNfjmAaj+zfgem0F0WUZ8PioEONVZTGnjLKPr7eX9AlXXKZkVOW6 i9FIMZwsHuJQyuHpOQlSHQN4ir89VlnzDMhUTAzd8Zf7eSHboPEcaZhPsDuoNQ/ncYgw rY6bfXyL0ZMIBwgWJRLaUKmCe1KO94NAKmMhNl7R4ZZtbsgAihJH9iDAAAEFOf6eiDGw Tq5KWe+ZWVF0RIb5M/oxZ8XaM8iwH6Hn1yaldZ1D7HU4waeSGEThVBFgqhD/4Na6ehU1 ELDeHjOmKWTZUAHva1TayPMCHa3B14SwwxjP5muyMuypEzv+z4fXHuZAv5aFaftDpuQk yZhQ== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 3/3] posix: Remove posix waitid Date: Tue, 18 Feb 2020 11:02:05 -0300 Message-Id: <20200218140205.18263-3-adhemerval.zanella@linaro.org> In-Reply-To: <20200218140205.18263-1-adhemerval.zanella@linaro.org> References: <20200218140205.18263-1-adhemerval.zanella@linaro.org> The POSIX waitid implementation is problematic in some ways: - It emulates using waitpid, which default implementation calls wait4 and wait4 returns ENOSYS as default. - Also by using waitpid it does not allod support the WNOWAIT, WEXITED, WSTOPPED, or WCONTINUED flag. With current POSIX specification the flags are no longer marked as optional. Also due BZ#23091 Hurd still uses the implementation, so it is moved to as a Hurd arch-specific folder (with some minor cleanups). Checked against a i686-gnu (run-built-tests=no) --- posix/tst-waitid.c | 14 +++--- sysdeps/{posix => mach/hurd}/waitid.c | 70 ++++----------------------- 2 files changed, 16 insertions(+), 68 deletions(-) rename sysdeps/{posix => mach/hurd}/waitid.c (65%) -- 2.17.1 diff --git a/posix/tst-waitid.c b/posix/tst-waitid.c index 2331c42e66..380d807498 100644 --- a/posix/tst-waitid.c +++ b/posix/tst-waitid.c @@ -80,10 +80,10 @@ do_test_waitd_common (idtype_t type, pid_t pid) { /* Adding process_state_tracing_stop ('t') allows the test to work under trace programs such as ptrace. */ - enum process_state_t stop_state = process_state_stopped - | process_state_tracing_stop; + enum support_process_state stop_state + = support_process_state_stopped | support_process_state_tracing_stop; - support_process_state_wait (pid, stop_state); + support_process_state_wait (pid, stop_state, NULL); check_sigchld (CLD_STOPPED, SIGSTOP, pid); @@ -117,7 +117,7 @@ do_test_waitd_common (idtype_t type, pid_t pid) FAIL_RET ("kill (%d, SIGCONT): %m\n", pid); /* Wait for the child to have continued. */ - support_process_state_wait (pid, process_state_sleeping); + support_process_state_wait (pid, support_process_state_sleeping, NULL); #if WCONTINUED != 0 { @@ -175,7 +175,7 @@ do_test_waitd_common (idtype_t type, pid_t pid) stopped, but if we are real quick and enter the waitid system call before the SIGCHLD has been generated, then it will be discarded and never delivered. */ - support_process_state_wait (pid, stop_state); + support_process_state_wait (pid, stop_state, NULL); fail = waitid (type, pid, &info, WEXITED|WSTOPPED); TEST_COMPARE (fail, 0); @@ -190,7 +190,7 @@ do_test_waitd_common (idtype_t type, pid_t pid) FAIL_RET ("kill (%d, SIGCONT): %m\n", pid); /* Wait for the child to have continued. */ - support_process_state_wait (pid, process_state_sleeping); + support_process_state_wait (pid, support_process_state_sleeping, NULL); check_sigchld (CLD_CONTINUED, SIGCONT, pid); @@ -219,7 +219,7 @@ do_test_waitd_common (idtype_t type, pid_t pid) TEST_COMPARE (info.si_status, SIGKILL); TEST_COMPARE (info.si_pid, pid); #else - support_process_state_wait (pid, process_state_zombie); + support_process_state_wait (pid, support_process_state_zombie, NULL); #endif check_sigchld (CLD_KILLED, SIGKILL, pid); diff --git a/sysdeps/posix/waitid.c b/sysdeps/mach/hurd/waitid.c similarity index 65% rename from sysdeps/posix/waitid.c rename to sysdeps/mach/hurd/waitid.c index f752076735..dce72339dd 100644 --- a/sysdeps/posix/waitid.c +++ b/sysdeps/mach/hurd/waitid.c @@ -17,25 +17,11 @@ License along with the GNU C Library; if not, see . */ -#include #include -#include -#define __need_NULL -#include #include -#include -#include - -#ifdef DO_WAITID -# define OUR_WAITID DO_WAITID -#elif !defined NO_DO_WAITID -# define OUR_WAITID do_waitid -#endif - -#ifdef OUR_WAITID -static int -OUR_WAITID (idtype_t idtype, id_t id, siginfo_t *infop, int options) +int +__waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options) { pid_t pid, child; int status; @@ -43,7 +29,7 @@ OUR_WAITID (idtype_t idtype, id_t id, siginfo_t *infop, int options) switch (idtype) { case P_PID: - if(id <= 0) + if (id <= 0) goto invalid; pid = (pid_t) id; break; @@ -72,31 +58,10 @@ OUR_WAITID (idtype_t idtype, id_t id, siginfo_t *infop, int options) return -1; } - /* This emulation using waitpid cannot support the waitid modes in which - we do not reap the child, or match only stopped and not dead children. */ - if (0 -#ifdef WNOWAIT - || (options & WNOWAIT) -#endif -#ifdef WEXITED - || ((options & (WEXITED|WSTOPPED|WCONTINUED)) - != (WEXITED | (options & WSTOPPED))) -#endif - ) - { - __set_errno (ENOTSUP); - return -1; - } - /* Note the waitid() is a cancellation point. But since we call waitpid() which itself is a cancellation point we do not have to do anything here. */ - child = __waitpid (pid, &status, - options -#ifdef WEXITED - &~ WEXITED -#endif - ); + child = __waitpid (pid, &status, options); if (child == -1) /* `waitpid' set `errno' for us. */ @@ -104,9 +69,11 @@ OUR_WAITID (idtype_t idtype, id_t id, siginfo_t *infop, int options) if (child == 0) { - /* The WHOHANG bit in OPTIONS is set and there are children available - but none has a status for us. The XPG docs do not mention this - case so we clear the `siginfo_t' struct and return successfully. */ + /* POSIX.1-2008, Technical Corrigendum 1 XSH/TC1-2008/0713 [153] states + that if waitid returns because WNOHANG was specified and status is + not available for any process specified by idtype and id, then the + si_signo and si_pid members of the structure pointed to by infop + shall be set to zero. */ infop->si_signo = 0; infop->si_code = 0; return 0; @@ -132,27 +99,8 @@ OUR_WAITID (idtype_t idtype, id_t id, siginfo_t *infop, int options) infop->si_code = CLD_STOPPED; infop->si_status = WSTOPSIG (status); } -#ifdef WIFCONTINUED - else if (WIFCONTINUED (status)) - { - infop->si_code = CLD_CONTINUED; - infop->si_status = SIGCONT; - } -#endif - else - /* Can't happen. */ - assert (! "What?"); return 0; } -#endif - - -int -__waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options) -{ - /* __waitpid should be a cancellation point. */ - return do_waitid (idtype, id, infop, options); -} weak_alias (__waitid, waitid) strong_alias (__waitid, __libc_waitid)