From patchwork Thu Aug 3 13:11:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 797208 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-82689-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="nfvnfgsC"; 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 3xNVqh2x7Dz9s7v for ; Thu, 3 Aug 2017 23:13:36 +1000 (AEST) 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=YOqu2+r7mjPdx4rfe6ufBGbqU+tLiuN cicaG/LPri07FipiUAtmD+nSMnZnKrUC52VLQ27UA2Jo9w9wu+LGDeJcxr0znrnO vKnjFz2EZYbhRKqd93aC6EaCWsWAJzSJFojxqGVnWRNu2smOEsxEx7EbPcMG+LMS BfyltXVvotN0= 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=63QCQyc5c49A/yDPXtqnz25d6d8=; b=nfvnf gsCgvKuTrd8r97hJxFjGT7bufTAT3V4jkVOt2uVyCTC4cT+Nm85VF82U80qwL+M7 vMyLpcdAnE2Pfz+LGoFmq9RbICgAESrEIK7IDb/IbSh7Mw1d+CnU5kChtlHyCsuK bYUmwFCeq+IxdwR35QlU9vHfVi/ywf75k/wGp8= Received: (qmail 62087 invoked by alias); 3 Aug 2017 13:11:57 -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 62017 invoked by uid 89); 3 Aug 2017 13:11:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=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=Hx-languages-length:2317 X-HELO: mail-qt0-f173.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=FxFEtlxwJ1XsuCYAXNYO29BB+o1Pkr7weHa/b/MsjwU=; b=p6duu+EP6gkWKnUDFwYXx2RsAHn4p3BIYezn2aPiK7oRMlEipRXgqF5FrGFa+pHGXf lEI2jVxgYTaZzrEjBBOqS7ldZtdhYK8WmaEzewowfO9bRVE715p0Tm/vv1nMbLeW5yWK tMmO17U8KZloSgJRzXQggqkZgkGdu8sxcCqHcMUBocMpo3ky0Qeos2ZVa5XPNFURQ7E8 vQ9PQ2rsraC9T2OWJYmbIkYkXNlbpZ1MRglv0IBEJ4VW1seDwKfERzSwSTVzjqG5U0ze XmSXRkK2jnIrIa7IHM6a1cMQMKf5y2KLpk5gXAR2YMSM/VZ1hycDsKq1mkZQI0pCfQQ3 tcJg== X-Gm-Message-State: AIVw112SXpGJoFZhoKyI6X814IuTVvZrKHC/XVbYiRrWsfN6PYIA0Paz vsvvEy8XuxS8mYT7VWAYIw== X-Received: by 10.237.60.122 with SMTP id u55mr1894325qte.169.1501765912423; Thu, 03 Aug 2017 06:11:52 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 11/14] Remove non cancellable sigsuspend definition Date: Thu, 3 Aug 2017 10:11:11 -0300 Message-Id: <1501765874-6201-12-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1501765874-6201-1-git-send-email-adhemerval.zanella@linaro.org> References: <1501765874-6201-1-git-send-email-adhemerval.zanella@linaro.org> There is no current internal usage fo non cancellable sigsuspend calls. Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu. * sysdeps/generic/not-cancel.h (sigsuspend_not_cancel): Remove macro. * sysdeps/unix/sysv/linux/not-cancel.h (sigsuspend_not_cancel): Likewise. --- ChangeLog | 5 +++++ sysdeps/generic/not-cancel.h | 2 -- sysdeps/mach/hurd/sigsuspend.c | 1 - sysdeps/unix/sysv/linux/not-cancel.h | 4 ---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf9bd57..9ed9789 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2017-08-02 Adhemerval Zanella + * sysdeps/generic/not-cancel.h (sigsuspend_not_cancel): Remove + macro. + * sysdeps/unix/sysv/linux/not-cancel.h (sigsuspend_not_cancel): + Likewise. + * nptl/pthread_mutex_timedlock.c (__pthread_mutex_timedlock): Replace nanosleep_not_cancel with __nanosleep_nocancel. * sysdeps/generic/not-cancel.h (nanosleep_not_cancel): Remove macro. diff --git a/sysdeps/generic/not-cancel.h b/sysdeps/generic/not-cancel.h index e4a8584..70ead55 100644 --- a/sysdeps/generic/not-cancel.h +++ b/sysdeps/generic/not-cancel.h @@ -42,7 +42,5 @@ __pause () #define __nanosleep_nocancel(requested_time, remaining) \ __nanosleep (requested_time, remaining) -#define sigsuspend_not_cancel(set) \ - __sigsuspend (set) #define NO_CANCELLATION 1 diff --git a/sysdeps/mach/hurd/sigsuspend.c b/sysdeps/mach/hurd/sigsuspend.c index 4f5af1d..e60f2eb 100644 --- a/sysdeps/mach/hurd/sigsuspend.c +++ b/sysdeps/mach/hurd/sigsuspend.c @@ -79,5 +79,4 @@ __sigsuspend (const sigset_t *set) return -1; } libc_hidden_def (__sigsuspend) -strong_alias (__sigsuspend, sigsuspend_not_cancel) weak_alias (__sigsuspend, sigsuspend) diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index 07f07f6..8740d40 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -86,8 +86,4 @@ libc_hidden_proto (__pause_nocancel) __typeof (__nanosleep) __nanosleep_nocancel; hidden_proto (__nanosleep_nocancel) -/* Uncancelable sigsuspend. */ -#define sigsuspend_not_cancel(set) \ - INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8) - #endif /* NOT_CANCEL_H */