From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 109881 invoked by alias); 4 Apr 2018 17:42:12 -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 109870 invoked by uid 89); 4 Apr 2018 17:42:11 -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,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy= 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:to:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=VKS4LgDBjvV/GRU5y8I9ih83EGsZVerVjjGGC7M4u7g=; b=tI3OJCWRPEA/IWO3nqaTHusH9EFYJOe1zVwk/QttLQ4IGAT8VlmJn6Z/FHfwU8dLbI fqOD7Fa4U77ffeZH89Xi3Wsw2qwDc5U0vuQg/RiPscmeO9TqtOuIg1rwnmFfWeTuByzQ Rr2a4svugYJbbmj5HqWD5WaNxyIo0aqM4yYPhIY43wSN7uTXI1h6sEmy3HQzrggxdgou unq6s5GvXcGfGSNePUGzlVIR8zPfnPWTm4s3FWWiDJxo0pdZjhcmZqFBxyeXiJ3zD/le mzWDwdvuP0D84j+73B+mk3xIYJE/BznjI+/1L4+snKZHvDdptpQyE4/Iw5MY2W7AseuR I9YA== X-Gm-Message-State: ALQs6tBWeUxGemAoX5g4LYKi5FcZDRcA8kFDQwjqn/CGg8OTPHHk9hmx bP1lcQgmgLiP9AE2cCwXCMk5ZiosCsY= X-Google-Smtp-Source: AIpwx4+FU0mVhMfjwOv+qZmJY8GgPvDxSP+sY6wepocxUeQKq02wmNHpMkx9AkPm9JO7KWbvy4+k/A== X-Received: by 10.200.17.138 with SMTP id d10mr28559351qtj.150.1522863726691; Wed, 04 Apr 2018 10:42:06 -0700 (PDT) Subject: Re: [COMMITTED PATCH] Make sysdeps/generic/internal-signals.h less stubby. To: libc-alpha@sourceware.org References: <20180404164518.11147-1-zackw@panix.com> From: Adhemerval Zanella Openpgp: preference=signencrypt Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <8f56a2a9-7c17-857c-0e7b-d003156536c2@linaro.org> Date: Wed, 04 Apr 2018 17:42:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180404164518.11147-1-zackw@panix.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-SW-Source: 2018-04/txt/msg00121.txt.bz2 On 04/04/2018 13:45, Zack Weinberg wrote: > Three of the functions defined by internal-signals.h were not actually > fulfilling their contracts when the sysdeps/generic version of that > file was used. Also, the Linux version included several more headers > than the generic version, which is the root cause of a build failure > on Hurd (already addressed in another way, but I think it is proper to > make the headers match). > > In principle, __libc_signal_block_all, __libc_signal_block_app, and > __libc_signal_restore_set could be defined in non-system-dependent > code, leaving only __is_internal_signal and __clear_internal_signal to > be defined by a sysdeps header, but the Linux version of > internal-signals.h wants to inline a raw rt_sigprocmask syscall, and I > don't feel like messing with that today. Thanks for catching it. If I remember correctly, I used an inlined rt_sigprocmask for Linux because both sigprocmask and pthread_sigmask filter both SIGCANCEL and SIGSETXID. We could use it for __libc_signal_block_app, but __libc_signal_block_all and __libc_signal_restore_set would require a new symbol. > > Tested with cross build to i686-gnu, committed. > > * sysdeps/generic/internal-signals.h: Include signal.h, > sigsetops.h, and stdbool.h. > (__libc_signal_block_all): Actually block all signals. > (__libc_signal_block_app): Likewise. > (__libc_signal_restore_set): Actually restore the signal mask. > --- > ChangeLog | 8 ++++++++ > sysdeps/generic/internal-signals.h | 15 ++++++++++++--- > 2 files changed, 20 insertions(+), 3 deletions(-) > > diff --git a/ChangeLog b/ChangeLog > index 663e80c195..43e0d6b95f 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,11 @@ > +2018-04-04 Zack Weinberg > + > + * sysdeps/generic/internal-signals.h: Include signal.h, > + sigsetops.h, and stdbool.h. > + (__libc_signal_block_all): Actually block all signals. > + (__libc_signal_block_app): Likewise. > + (__libc_signal_restore_set): Actually restore the signal mask. > + > 2018-04-04 Florian Weimer > > inet: Actually build and run tst-deadline. > diff --git a/sysdeps/generic/internal-signals.h b/sysdeps/generic/internal-signals.h > index 17ed48c5bf..5282cffce0 100644 > --- a/sysdeps/generic/internal-signals.h > +++ b/sysdeps/generic/internal-signals.h > @@ -19,6 +19,10 @@ > #ifndef __INTERNAL_SIGNALS_H > # define __INTERNAL_SIGNALS_H > > +#include > +#include > +#include > + > static inline bool > __is_internal_signal (int sig) > { > @@ -33,20 +37,25 @@ __clear_internal_signals (sigset_t *set) > static inline int > __libc_signal_block_all (sigset_t *set) > { > - return 0; > + sigset_t allset; > + __sigfillset (&allset); > + return __sigprocmask (SIG_BLOCK, &allset, set); > } > > static inline int > __libc_signal_block_app (sigset_t *set) > { > - return 0; > + sigset_t allset; > + __sigfillset (&allset); > + __clear_internal_signals (&allset); > + return __sigprocmask (SIG_BLOCK, &allset, set); > } > > /* Restore current process signal mask. */ > static inline int > __libc_signal_restore_set (const sigset_t *set) > { > - return 0; > + return __sigprocmask (SIG_SETMASK, set, NULL); > } > > >