From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 53484 invoked by alias); 19 Feb 2018 17:50:45 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 53383 invoked by uid 89); 19 Feb 2018 17:50:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.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.2 spammy=guards X-HELO: mail-qt0-f195.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=fYEBMfv2kVtXIs4CTuVT6+fcSGJxwcvpF/0Aw/yF5Ew=; b=JrJHcfs7JMnCGmAI+rZXC1fnmwWhMGmpj1c75i0wsx5GNLQqPZNM75Lvamg4WPXOcG si48ftjfaAZRqUfMQAm4wgNKHeoGMBJNP+Dxnj6uMWC4+IVq2Ifa9MMpmJJIZ7X2mhPP 7Wd2Kd5BMFMXPUDMs+ggnajpTypa74H7zbmjSJOC4EG+cOTqu01V5408Mlb7by4ZNI8O D9tKs8x6PnsQJmqZUmh4oCWyZ5Odl+iN1zVDRzJaQOVFob9puVATwoZL/3/5b8CPEZh4 H7qkd95amMD1Bx3VYEe0Fy6iHZ9PA3oJLCECfExBWaCdxFYuHlIcmPiZaj1n7g42qzxY z2RQ== X-Gm-Message-State: APf1xPClgn1JpTC1HVH81/huB0EnEyzMCB1ervckcQ1FeY1vaEgXKMRi rMtW8coeKkJtWHSXLXdXpIdKiyXs0+Q= X-Google-Smtp-Source: AH8x227jzTc0RYhGFcxTMbW6PZnXvB3EUkGkht82VAxAA+QhC8PQ8oceS5jG3oIrog30DT60CusHPA== X-Received: by 10.200.45.217 with SMTP id q25mr25517312qta.215.1519062639336; Mon, 19 Feb 2018 09:50:39 -0800 (PST) Subject: Re: [PATCH v4 1/4] Rename nptl-signals.h to internal-signals.h From: Adhemerval Zanella To: libc-alpha@sourceware.org References: <1518439345-6013-1-git-send-email-adhemerval.zanella@linaro.org> Message-ID: Date: Mon, 19 Feb 2018 17:51:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <1518439345-6013-1-git-send-email-adhemerval.zanella@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2018-02/txt/msg00514.txt.bz2 Ping. On 12/02/2018 10:42, Adhemerval Zanella wrote: > Changes from previous version: > > - Fixed documentation issues pointed out by Rical Jasan. > > -- > > 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 | 14 ++++++++++++++ > 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, 28 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%) > > diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h > index 583515f..075530c 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 e1275c7..01e5b75 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-2018 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 e789198..e007372 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-2018 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 cb98f90..b05eae2 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 6b699a4..0391b9b 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 > { >