From patchwork Mon Nov 6 13:36:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 118041 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2775261qgn; Mon, 6 Nov 2017 05:37:32 -0800 (PST) X-Google-Smtp-Source: ABhQp+StIfN9U6cFFB4R8O5MqSEzIFssn58Z9dh5cWyZpxes9zoWaeKP9Bz+butv/HM5hv11amH1 X-Received: by 10.84.132.104 with SMTP id 95mr14544734ple.170.1509975452536; Mon, 06 Nov 2017 05:37:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1509975452; cv=none; d=google.com; s=arc-20160816; b=D3mlvm6k3BLjWnAPvEqXkQ+TwRjAMd+Hn17i2OaBAi07DladZlUI33XQ1JJQhmCSgo CAwM1bSnEEfScuC+P7c6VabWnkn8lPx5y9ob0vJlgNe/uFkRIJDNM8zUMEQzxgzZh9t/ CzV0Tfnoy8v+37lqRIj9oK5f5GfmopXh7R7UFdcDFMxOzZDPtAor3EzN4E0lQfY22IsJ RjeFUGx77srDVe7vBeJIbmUT1KNVXaUpqS0MgXNkZEmju09xmWQQaPGuq3PDdCPPVd+/ ftyMUIO8CQfZZZIHKOYytSFWhTm02L430TTXDfoylJLvor3SCerrkN3pxPHzY4KTT2k4 HeZg== 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=q5/Q2qbZbWqt4tQ9POZxp3UGrVVbfQfAQAxvvxBrkWo=; b=vIw9ftSJeXWjn2tO99rQhbzX4xL5p/O8+DzBooIT5NLHB12LWDru5iBoibqcyRm9BD vgN+MzOKlUEgi7S8pm7meNP5ff8z3OtMvsPfXqMBBKaru+VnUFQCvSI9dMzQbQoLJOCc PnPYdJjVXIvIfOtVqoIC1WmtWQ3UUaPkFyDmCK/UPUBc6W00Gqv1WUAZT1x14DjRAO+1 cJIVIH9dBSm5we7fbudcRDIODs1UBdsSa6GX4hyRmHBKhGwUu2lqc2FvAzbgX3CFSa7n COjzZWsbJMl7NcwMc98gIPSoiPZi4JsSTVFzevrPQlqciHQu2pvmsksvq9emmwrhHWa4 q9SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=HLQ/KjRL; spf=pass (google.com: domain of libc-alpha-return-86792-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86792-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 w10si11001237pgr.25.2017.11.06.05.37.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 05:37:32 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-86792-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=HLQ/KjRL; spf=pass (google.com: domain of libc-alpha-return-86792-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86792-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=htVZot7SjMzQc9NXVdFEi23TNziDm4whevAhyUL3UH82I+NCBr1dp UMCRDknsLdbru3YGLSjX7Vyh98EUlWptxmR968YzjgIhIO2gs+rWexn6ZdDIkEZb ulESQ2SSsjr6HCejvEg8Kfh8ppW0BS9iZNBlFQnb2XCsbVof1kwt5Q= 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=vn+YNDGH0LusaHyYOxGZ4Np22SI=; b=HLQ/KjRLRTeGSL6MOfDsGQC8SvMA 0dQ+UTt3dXEuvqE91/cvKMYhPmjz8SP4VnEzyiZq+eL6Ro1GbQwlH3woDF4xhouG iIe5RWqL+IcMbXePN/4ORy981cE8a8sdci6w0Io4Ur/9FJ8vx0J1lH9anolTwxzG zrE4Egm42Now1Bk= Received: (qmail 33283 invoked by alias); 6 Nov 2017 13:37:19 -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 33268 invoked by uid 89); 6 Nov 2017 13:37:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 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=communicate, sk:INTERNA 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:from:to:subject:date:message-id; bh=q5/Q2qbZbWqt4tQ9POZxp3UGrVVbfQfAQAxvvxBrkWo=; b=LDvUB8EumXoeb3mmpFycZN+q2Liz9MybHgGLy+BHUxgO8uvJWWo0W4aWBUr017wh/4 CX4PUDPErsU0AVzcLf2EJS0934Y1ccibYdIwq6G4ATkMPcYoBJfWN9HL0KVC6sQB/ecI u6sBhsYkVsj+kWiBQrNmrZd+FojQqLJX9jZOnX3n6zFWFEk6YTOvdn5MiTku5SRwcd0h /DgliSsmntARFkIymhlAaxnYiefH/ZVIijWCYeFoUi00eGTvnZ956NFewZSLJ8FxrMNf PiVoM19FBcXNHltrE9CHx7ImyQoFOxnYzdBkwxYLq7kY+8SlGsiv+fpr/H//GS8Sksnn QS7w== X-Gm-Message-State: AMCzsaUJxYcsyDB3nDEZlhWBlLVa51XjS9XE7qH6gOB7EAqTYWfSIUzT nrZT5fRwQn3FJ7h5s5ePjP6dy5x3rvw= X-Received: by 10.200.3.205 with SMTP id z13mr23751438qtg.25.1509975434878; Mon, 06 Nov 2017 05:37:14 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 1/8] Rename nptl-signals.h to internal-signals.h Date: Mon, 6 Nov 2017 11:36:59 -0200 Message-Id: <1509975426-1772-1-git-send-email-adhemerval.zanella@linaro.org> 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 +------ .../unix/sysv/linux/{nptl-signals.h => internal-signals.h} | 13 +++++++++---- sysdeps/unix/sysv/linux/raise.c | 2 +- sysdeps/unix/sysv/linux/spawni.c | 2 +- 6 files changed, 27 insertions(+), 13 deletions(-) rename sysdeps/{nptl/nptl-signals.h => generic/internal-signals.h} (74%) rename sysdeps/unix/sysv/linux/{nptl-signals.h => internal-signals.h} (91%) -- 2.7.4 diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index dbf46b0..e0872b9 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 91% rename from sysdeps/unix/sysv/linux/nptl-signals.h rename to sysdeps/unix/sysv/linux/internal-signals.h index f30c597..797698b 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,14 +38,14 @@ /* 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); } /* 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); @@ -66,7 +69,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 +86,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 {