From patchwork Wed Nov 15 17:54:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 118987 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4608227qgn; Wed, 15 Nov 2017 09:54:36 -0800 (PST) X-Google-Smtp-Source: AGs4zMajamnUkOUwxRHo0UkE/omNe1wvVq/bfUmRF9YZKek065UEDEvKF2eHiohn60/Tt3kfKaxD X-Received: by 10.98.141.150 with SMTP id p22mr4280146pfk.207.1510768476623; Wed, 15 Nov 2017 09:54:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510768476; cv=none; d=google.com; s=arc-20160816; b=maSKnSsyPNMoR/WYVpfWD96tEvnMSuTde2sbK+b8IAllmdWoT9juuZwct/nwxp2Vb+ eijZVrDVMLpYcS1cH4+vm8cVsS/Z8IJ6GlRQqqMIMS37KTpdEyurj7vXpzuuKUUZ35e/ TW3YKDVaqSnMYK5a4Pw6ED8tEDagQAUqy8nJnsO+D7vS5hI6UypESP8axPgkq2cXAsg/ ioUowQ88o+CuVZdl0tCmM+I+vq1CyGA6r2Ij1K+hjux8l3KAXukSNEpZ9M3IvpKLm6VX pRxVRtFSNVyBheLNYr+EGA4S8KWSdq/WWU8H2BPddAKc1kqhK1fLAoO7K/SA5pd0ByYo LZ2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from:delivered-to:sender:list-help :list-post:list-archive:list-subscribe:list-unsubscribe:list-id :precedence:mailing-list:dkim-signature:domainkey-signature :arc-authentication-results; bh=5SEdpFeANCuu/lVIo83TIWP7yVqMFzVOJBdNkLVo9kQ=; b=yzTFtlo4Rlk5mu3mEFshmPVv5bJhzRXykUnF6NjzrX1AL1fSI7mHb+aZhJutGI+1Jx vZPV8k/yuFuKFQPTUy9xs8HNN52v+/k8E+IEl56vn4I58dMjHZDjNfNBNkMnOEUW2iae 05iZ1pJB2RDjEufxX4ffsMw6ivFuZm80ZYhIZVm69ML0u3lc/bw3VJlp5Chu5g4sAIEu mHkqBEtR+3ZD3DQJK1JGd+H0nnxhOOr+Za9Md6XFWEARBjWi+ajNYzUsX+QBHORz1FzN fRjhYSuOvI4rq45R1TIgL9MUmDL4IkpXimBI/uY9EQmDLmhuZNyn8ibqF0NWiJkhX6sO pJew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=n/Dom3k+; spf=pass (google.com: domain of libc-alpha-return-87162-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-87162-patch=linaro.org@sourceware.org; dmarc=fail (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 e7si6076617pfl.148.2017.11.15.09.54.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Nov 2017 09:54:36 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-87162-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=n/Dom3k+; spf=pass (google.com: domain of libc-alpha-return-87162-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-87162-patch=linaro.org@sourceware.org; dmarc=fail (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; q=dns; s= default; b=dF9WpeEoy4rfYsVKd35ExoVjW+FBpw0xIyGuc47N26jzD6j8IEwUs H4bbT5CSZ4F/MMlYjESsjdQKzSJ2meZ9cW6toHsaJ0w/kAZWj1tudsV3JaO9ucM9 pkiURjFfHUpwMmBFqtAAPV6D5pV5P2KZSvonYZ59FCzPAXXsR5ptuA= 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; s=default; bh=OplkHScc5D7CnB6Vv8Y205joHw4=; b=n/Dom3k+bv+jkakn1NE1rHthZQFo 8UWqmu1Bpy0EEtz5wTH6bBSI85f8HZ6vMoDZLI8IDaotpC4Rt15wv5+dIwlgAyU/ XEcibn3Sny++mAhanfhizVWXBctj5HNNtGl6mLo+hWZDF5XprumTZJ/AYZ8stiQP //9PGvJcQl0hsSU= Received: (qmail 6225 invoked by alias); 15 Nov 2017 17:54:22 -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 6213 invoked by uid 89); 15 Nov 2017 17:54:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=guards X-HELO: mail-qt0-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; bh=5SEdpFeANCuu/lVIo83TIWP7yVqMFzVOJBdNkLVo9kQ=; b=uaWEmg59/FwlW6aDKzLvlTaQxr7La1XaMBdp7/SmlouGAJBJVm4EJwAY/xoKrQJNCK mm5auLYc7rKLK3TcU/nYpgPz+0v05kwrCl/nuL9s08iBwywbQEyOnL0C0SZyWli9vBkN eASLEuuQSCKhaPT2OuuFi8oigwFOQsJe8DCQTXqM/W/pyqzfONoUQmJizHhkFpsUyGHs UfFG6VBwf7EbUWxQ/8xJHHHx+zP3NdCv/1N5PfhvN+0YBweTMjNBhM2Dyt2hwd9sTVGT 2l96rm40e2jKzSgxdzIcP6y6j5zS23CRw/deHVypM302q7XtpuSTX2dl2XSyen/Aj2fT 5WBA== X-Gm-Message-State: AJaThX5H1UMYEVoEm0lfLZSdLjUXlwrkidUzUE5V6KkWf84Aa/fP1gAk dL5nvFp54bvjvPRtisrpwhywcxnxMxQ= X-Received: by 10.55.128.66 with SMTP id b63mr26216581qkd.67.1510768457895; Wed, 15 Nov 2017 09:54:17 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v3 1/3] Rename nptl-signals.h to internal-signals.h Date: Wed, 15 Nov 2017 15:54:09 -0200 Message-Id: <1510768451-18453-1-git-send-email-adhemerval.zanella@linaro.org> Changes from previous version: - Cleanup __nptl prefix from the generic names. - Remove superflous SIGTERM handling on Linux __is_internal_signal and __clear_internal_signals. --- This patch renames the nptl-signals.h header to internal-signals.h. On Linux the definitions and functions are not only NPTL related, but used for other POSIX definitions as well (for instance SIGTIMER for posix times, SIGSETXID for id functions, and signal block/restore helpers) and since generic functions will be places and used in generic implementation it makes more sense to decouple it from NPTL. Checked on x86_64-linux-gnu. * sysdeps/nptl/nptl-signals.h: Move to ... * sysdeps/generic/internal-signals.h: ... here. Adjust internal comments. * sysdeps/unix/sysv/linux/internal-signals.h: Add include guards. (__nptl_is_internal_signal): Rename to __is_internal_signal. (__nptl_clear_internal_signals): Rename to __clear_internal_signals. * sysdeps/unix/sysv/linux/raise.c: Adjust nptl-signal.h to include-signals.h rename. * nptl/pthreadP.h: Likewise. * sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Call __is_internal_signal instead of __nptl_is_internal_signal. Signed-off-by: Adhemerval Zanella --- ChangeLog | 12 ++++++++++++ nptl/pthreadP.h | 2 +- .../{nptl/nptl-signals.h => generic/internal-signals.h} | 7 +------ .../sysv/linux/{nptl-signals.h => internal-signals.h} | 16 ++++++++++------ sysdeps/unix/sysv/linux/raise.c | 2 +- sysdeps/unix/sysv/linux/spawni.c | 2 +- 6 files changed, 26 insertions(+), 15 deletions(-) rename sysdeps/{nptl/nptl-signals.h => generic/internal-signals.h} (74%) rename sysdeps/unix/sysv/linux/{nptl-signals.h => internal-signals.h} (89%) -- 2.7.4 diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 1cc80b6..f3ec832 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include /* Atomic operations on TLS memory. */ diff --git a/sysdeps/nptl/nptl-signals.h b/sysdeps/generic/internal-signals.h similarity index 74% rename from sysdeps/nptl/nptl-signals.h rename to sysdeps/generic/internal-signals.h index 298acf2..55bc07d 100644 --- a/sysdeps/nptl/nptl-signals.h +++ b/sysdeps/generic/internal-signals.h @@ -1,4 +1,4 @@ -/* Special use of signals in NPTL internals. Stub version. +/* Special use of signals internally. Stub version. Copyright (C) 2014-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -15,8 +15,3 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, see . */ - -/* This file can define the macros SIGCANCEL, SIGTIMER, and SIGSETXID to - signal numbers reserved by libpthread for those internal purposes. - - Note that some code presumes SIGTIMER is the same as SIGCANCEL. */ diff --git a/sysdeps/unix/sysv/linux/nptl-signals.h b/sysdeps/unix/sysv/linux/internal-signals.h similarity index 89% rename from sysdeps/unix/sysv/linux/nptl-signals.h rename to sysdeps/unix/sysv/linux/internal-signals.h index f30c597..e96a718 100644 --- a/sysdeps/unix/sysv/linux/nptl-signals.h +++ b/sysdeps/unix/sysv/linux/internal-signals.h @@ -1,4 +1,4 @@ -/* Special use of signals in NPTL internals. Linux version. +/* Special use of signals internally. Linux version. Copyright (C) 2014-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -16,6 +16,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef __INTERNAL_SIGNALS_H +# define __INTERNAL_SIGNALS_H + #include #include @@ -35,17 +38,16 @@ /* Return is sig is used internally. */ static inline int -__nptl_is_internal_signal (int sig) +__is_internal_signal (int sig) { - return (sig == SIGCANCEL) || (sig == SIGTIMER) || (sig == SIGSETXID); + return (sig == SIGCANCEL) || (sig == SIGSETXID); } /* Remove internal glibc signal from the mask. */ static inline void -__nptl_clear_internal_signals (sigset_t *set) +__clear_internal_signals (sigset_t *set) { __sigdelset (set, SIGCANCEL); - __sigdelset (set, SIGTIMER); __sigdelset (set, SIGSETXID); } @@ -66,7 +68,7 @@ static inline int __libc_signal_block_app (sigset_t *set) { sigset_t allset = SIGALL_SET; - __nptl_clear_internal_signals (&allset); + __clear_internal_signals (&allset); INTERNAL_SYSCALL_DECL (err); return INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_BLOCK, &allset, set, _NSIG / 8); @@ -83,3 +85,5 @@ __libc_signal_restore_set (const sigset_t *set) /* Used to communicate with signal handler. */ extern struct xid_command *__xidcmd attribute_hidden; + +#endif diff --git a/sysdeps/unix/sysv/linux/raise.c b/sysdeps/unix/sysv/linux/raise.c index 70e5a98..1167950 100644 --- a/sysdeps/unix/sysv/linux/raise.c +++ b/sysdeps/unix/sysv/linux/raise.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include int raise (int sig) diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c index fb83c2e..af464b5 100644 --- a/sysdeps/unix/sysv/linux/spawni.c +++ b/sysdeps/unix/sysv/linux/spawni.c @@ -144,7 +144,7 @@ __spawni_child (void *arguments) } else if (sigismember (&hset, sig)) { - if (__nptl_is_internal_signal (sig)) + if (__is_internal_signal (sig)) sa.sa_handler = SIG_IGN; else {