From patchwork Thu Mar 12 20:54:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 38535 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf42.google.com (mail-qv1-xf42.google.com [IPv6:2607:f8b0:4864:20::f42]) by sourceware.org (Postfix) with ESMTPS id B15023877021 for ; Thu, 12 Mar 2020 20:54:31 +0000 (GMT) Received: by mail-qv1-xf42.google.com with SMTP id w5so3388292qvp.11 for ; Thu, 12 Mar 2020 13:54:31 -0700 (PDT) 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=QgC9R9v+zVhRKsEh4xYjvFc6R11q3Ksl9Zot+eMBQHE=; b=dIxdmHi036y1G5ix9q9fMrnLua+lPmuwrmM8IR6HWEA5TgowNxmFoPTXtGY8rjuyxM d9oBPyt+uIgZ6cO0t2JIi89tWBGX0UzpYQ/dsms+mID0vc7eJq+BmUHjKlNvMoVeX/c5 4tEvOvdUncjlbEcdwpiZKafbk5wbNJEY2o7Z7EOFCiHfaM8fh4jpoh7R9M/vwDSU3Zh2 helNl0MhQd4HdQJDg2s/uDujQoTXdZPxUkl/i21WAXKVJT3zO638sR7ETK78ExNHMSDS FSf+cUbhcgqkj/zfC6XyM8NFoXY2pu/olMI+bIVRKZ7b37fBbjlzBvUY/1c2ajFk/s5A asKA== X-Gm-Message-State: ANhLgQ0/c3Q9667M0JdecYL5BrMJpRElqD4VpAojwlIz3c0S+j+zvDiw o4ynGslIH9VAk4mftcq5RYpfNBafKOo= X-Google-Smtp-Source: ADFU+vuja5K8yxThIxYEx72IGe9jvGH67ce/rniK3l3/L1kDhb9kHCYXV2YmazLfYIMd1cIm9l9QfQ== X-Received: by 2002:a05:6214:1351:: with SMTP id b17mr9393329qvw.251.1584046471059; Thu, 12 Mar 2020 13:54:31 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id k11sm27862246qti.68.2020.03.12.13.54.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 13:54:30 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 2/3] linux: Use pthread_sigmask on sigprocmask Date: Thu, 12 Mar 2020 17:54:23 -0300 Message-Id: <20200312205424.17101-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200312205424.17101-1-adhemerval.zanella@linaro.org> References: <20200312205424.17101-1-adhemerval.zanella@linaro.org> X-Spam-Status: No, score=-27.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2020 20:54:32 -0000 With pthread_sigmask on libc.so, it allows consolidate both implementations. Checked on x86_64-linux-gnu. --- nptl/pthreadP.h | 3 +++ nptl/pthread_sigmask.c | 4 +++- sysdeps/unix/sysv/linux/sigprocmask.c | 20 +++++--------------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 06fb0d74c5..c6d8fc69be 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -482,6 +482,9 @@ extern void __pthread_testcancel (void); extern int __pthread_clockjoin_ex (pthread_t, void **, clockid_t, const struct timespec *, bool) attribute_hidden; +extern int __pthread_sigmask (int how, const sigset_t *newmask, + sigset_t *oldmask); +libc_hidden_proto (__pthread_sigmask) #if IS_IN (libpthread) diff --git a/nptl/pthread_sigmask.c b/nptl/pthread_sigmask.c index c7860e02a5..9c7e9e270a 100644 --- a/nptl/pthread_sigmask.c +++ b/nptl/pthread_sigmask.c @@ -23,7 +23,7 @@ int -pthread_sigmask (int how, const sigset_t *newmask, sigset_t *oldmask) +__pthread_sigmask (int how, const sigset_t *newmask, sigset_t *oldmask) { sigset_t local_newmask; @@ -47,3 +47,5 @@ pthread_sigmask (int how, const sigset_t *newmask, sigset_t *oldmask) ? INTERNAL_SYSCALL_ERRNO (result) : 0); } +libc_hidden_def (__pthread_sigmask) +weak_alias (__pthread_sigmask, pthread_sigmask) diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c index eb9e4d5e83..6ed0ab1e6a 100644 --- a/sysdeps/unix/sysv/linux/sigprocmask.c +++ b/sysdeps/unix/sysv/linux/sigprocmask.c @@ -22,21 +22,11 @@ int __sigprocmask (int how, const sigset_t *set, sigset_t *oset) { - sigset_t local_newmask; - - /* The only thing we have to make sure here is that SIGCANCEL and - SIGSETXID are not blocked. */ - if (set != NULL - && __glibc_unlikely (__sigismember (set, SIGCANCEL) - || __glibc_unlikely (__sigismember (set, SIGSETXID)))) - { - local_newmask = *set; - __sigdelset (&local_newmask, SIGCANCEL); - __sigdelset (&local_newmask, SIGSETXID); - set = &local_newmask; - } - - return INLINE_SYSCALL_CALL (rt_sigprocmask, how, set, oset, _NSIG / 8); + int result = __pthread_sigmask (how, set, oset); + if (result == 0) + return 0; + __set_errno (result); + return result; } libc_hidden_def (__sigprocmask) weak_alias (__sigprocmask, sigprocmask)