lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

nptl: SIGCANCEL, SIGTIMER, SIGSETXID are always defined

Browse Source 
All nptl targets have these signal definitions nowadays.  This
changes also replaces the nptl-generic version of pthread_sigmask
with the Linux version.

Tested on x86_64-linux-gnu and i686-linux-gnu.  Built with
build-many-glibcs.py.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer
2019-10-18 14:29:04 +02:00
parent 5e20aae5ee
commit e4b3707cea
10 changed files with 34 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
nptl/pthread_sigmask.c
View File

@ -1,6 +1,6 @@
/* Examine and change blocked signals for a thread. Generic POSIX version.
Copyright (C) 2014-2019 Free Software Foundation, Inc.
/* Copyright (C) 2002-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@ -19,18 +19,36 @@
#include <errno.h>
#include <signal.h>
#include <pthreadP.h>
#include <sysdep.h>
#if defined SIGCANCEL || defined SIGTIMER || defined SIGSETXID
# error "This implementation assumes no internal-only signal numbers."
#endif
int
pthread_sigmask (int how, const sigset_t *newmask, sigset_t *oldmask)
{
/* Here we assume that sigprocmask actually does everything right.
The only difference is the return value protocol. */
int result = sigprocmask (how, newmask, oldmask);
if (result < 0)
result = errno;
return result;
sigset_t local_newmask;
/* The only thing we have to make sure here is that SIGCANCEL and
SIGSETXID is not blocked. */
if (newmask != NULL
&& (__builtin_expect (__sigismember (newmask, SIGCANCEL), 0)
|| __builtin_expect (__sigismember (newmask, SIGSETXID), 0)))
{
local_newmask = *newmask;
__sigdelset (&local_newmask, SIGCANCEL);
__sigdelset (&local_newmask, SIGSETXID);
newmask = &local_newmask;
}
#ifdef INTERNAL_SYSCALL
/* We know that realtime signals are available if NPTL is used. */
INTERNAL_SYSCALL_DECL (err);
int result = INTERNAL_SYSCALL (rt_sigprocmask, err, 4, how, newmask,
oldmask, _NSIG / 8);
return (INTERNAL_SYSCALL_ERROR_P (result, err)
? INTERNAL_SYSCALL_ERRNO (result, err)
: 0);
#else
return sigprocmask (how, newmask, oldmask) == -1 ? errno : 0;
#endif
}