From patchwork Mon Nov 6 13:37:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 834754 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-86798-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="SASv0Spj"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yVtth50XXz9s7h for ; Tue, 7 Nov 2017 00:38:36 +1100 (AEDT) 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=BbxMnNF23O1N3sGVAayW9vr3MI5ssJb gt6sm3pMMG/u+9l5me9wXUjYiaOT2onG9ULBac7lg09k4UA+wOnS/8ZwJoqY0VrN FNXhCyPIkHN+daIyZ/HcScWD+PeJ2vxBdcMP9rO/S+jzBRZCqAU07ZqfcXhldO9q XbSgHIEjhhNo= 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=xsuoJKdQzFbZwZ3RgeXmVKfA1ME=; b=SASv0 SpjInKOrfrA0WvKPunibJpdNJIkqJeUZY5QsVMPpyUgaMrYPqprOrM3bBhQyBR3x 7ZIYKHywF2BzijRXlOPEewBW26wHwlkQ90G0DqsuHq9J37EfcAQGo5G6Z1klLfuY hvFqckAZcb/GCjWFHZF03xV7BTPmUgeg0ZUGng= Received: (qmail 34467 invoked by alias); 6 Nov 2017 13:37:28 -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 34351 invoked by uid 89); 6 Nov 2017 13:37:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=arrive X-HELO: mail-qk0-f196.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=b7wXfSr7SeNsv9K+Zmic9yzAhi92y+B+49e0AmSLZuc=; b=unc8ftWEPx3CjVnVpoyo5L/2GRpU5nqqMOtvV/1ILSjobVDrE0A9mVqUjFrLL382rp GQHgJrYQCiDLDmHeVoz7CQQbWyfL9/5aOejv9gbYTaEVVm5XwhsUr9oiVDd39PimXgZE okRIhdoYls8QQMtBZvG2OOV8HflZV0v7tLA0DUqrElwd0P37EaPp1nRR4Q7B+IFT9f1T MdabqFNzytPxU1/71B5OZQk+DHlIsiQSJrtKfok+7ChPFVNBxgf1yccES4h6W51Ubqca /pRNxa6Pz7XxN2XcpdRIvF99rcGirMpd3em5L8PqWOjedv9eMDRUuIbS5k+JveJPAkZn zP+g== X-Gm-Message-State: AJaThX5IZlCm+LJ2gKkRdQJRGWRnwIoC6CyxhS7HwneHdGpJhs5SA5e+ QOGRXHXsgJIwnQcbnHugKM5RXtpgf4I= X-Google-Smtp-Source: ABhQp+Q0q3g1mBVXvCBj1GTKE2MW2XB331Hx8gcO0u+lWY8G/cw6KMvgtRNjXWRxiLCILTgJunmf7w== X-Received: by 10.55.5.139 with SMTP id 133mr915685qkf.220.1509975443929; Mon, 06 Nov 2017 05:37:23 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 7/8] Cleanup sigpause implementation Date: Mon, 6 Nov 2017 11:37:05 -0200 Message-Id: <1509975426-1772-7-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1509975426-1772-1-git-send-email-adhemerval.zanella@linaro.org> References: <1509975426-1772-1-git-send-email-adhemerval.zanella@linaro.org> This patch simplify sigpause by remobing the single thread optimization since it will be handled already by the __sigsuspend call. Checked on x86_64-linux-gnu. * sysdeps/posix/sigpause.c (do_sigpause): Remove. (__sigpause): Rely on __sigsuspend to implement single thread optimization. Add LIBC_CANCEL_HANDLED for cancellation marking. Signed-off-by: Adhemerval Zanella Reviewed-by: Zack Weinberg --- ChangeLog | 4 ++++ sysdeps/posix/sigpause.c | 26 ++++++-------------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c index 9038ed3..a61e056 100644 --- a/sysdeps/posix/sigpause.c +++ b/sysdeps/posix/sigpause.c @@ -19,15 +19,13 @@ #include #include #include /* For NULL. */ -#include #undef sigpause #include +#include -/* Set the mask of blocked signals to MASK, - wait for a signal to arrive, and then restore the mask. */ -static int -do_sigpause (int sig_or_mask, int is_sig) +int +__sigpause (int sig_or_mask, int is_sig) { sigset_t set; @@ -46,21 +44,6 @@ do_sigpause (int sig_or_mask, int is_sig) to do anything here. */ return __sigsuspend (&set); } - -int -__sigpause (int sig_or_mask, int is_sig) -{ - if (SINGLE_THREAD_P) - return do_sigpause (sig_or_mask, is_sig); - - int oldtype = LIBC_CANCEL_ASYNC (); - - int result = do_sigpause (sig_or_mask, is_sig); - - LIBC_CANCEL_RESET (oldtype); - - return result; -} libc_hidden_def (__sigpause) /* We have to provide a default version of this function since the @@ -87,3 +70,6 @@ __xpg_sigpause (int sig) return __sigpause (sig, 1); } strong_alias (__xpg_sigpause, __libc___xpg_sigpause) + +/* __sigsuspend handles cancellation. */ +LIBC_CANCEL_HANDLED ();