picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

linux: Use pthread_sigmask on sigprocmask

Browse source 
With pthread_sigmask on libc.so, it allows implement sigprocmask
on top of pthread_sigmask.

Checked on x86_64-linux-gnu.
This commit is contained in:
Adhemerval Zanella 2020-03-11 15:21:59 -03:00
parent 34d49f120d
commit 2f6fa80147
4 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nptl/pthreadP.h
View file

@ -482,6 +482,8 @@ extern void __pthread_testcancel (void);
extern int __pthread_clockjoin_ex (pthread_t, void **, clockid_t,
const struct timespec *, bool)
attribute_hidden;
extern int __pthread_sigmask (int, const sigset_t *, sigset_t *);
libc_hidden_proto (__pthread_sigmask);
#if IS_IN (libpthread)

1
nptl/pthread_sigmask.c
View file

@ -46,6 +46,7 @@ __pthread_sigmask (int how, const sigset_t *newmask, sigset_t *oldmask)
? INTERNAL_SYSCALL_ERRNO (result)
: 0);
}
libc_hidden_def (__pthread_sigmask)
versioned_symbol (libc, __pthread_sigmask, pthread_sigmask, GLIBC_2_32);
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_32)

20
sysdeps/unix/sysv/linux/sigprocmask.c
View file

@ -22,21 +22,11 @@
int
__sigprocmask (int how, const sigset_t *set, sigset_t *oset)
{
sigset_t local_newmask;
/* The only thing we have to make sure here is that SIGCANCEL and
SIGSETXID are not blocked. */
if (set != NULL
&& __glibc_unlikely (__sigismember (set, SIGCANCEL)
|| __glibc_unlikely (__sigismember (set, SIGSETXID))))
{
local_newmask = *set;
__sigdelset (&local_newmask, SIGCANCEL);
__sigdelset (&local_newmask, SIGSETXID);
set = &local_newmask;
}
return INLINE_SYSCALL_CALL (rt_sigprocmask, how, set, oset, _NSIG / 8);
int result = __pthread_sigmask (how, set, oset);
if (result == 0)
return 0;
__set_errno (result);
return -1;
}
libc_hidden_def (__sigprocmask)
weak_alias (__sigprocmask, sigprocmask)

19
sysdeps/unix/sysv/linux/test-errno-linux.c
View file

@ -120,6 +120,17 @@ check_error_in_list (int code, int *codes, size_t count)
#define test_wrp2(experr, syscall, ...) \
test_wrp_rv(int, "%d", LIST_FORWARD (experr), syscall, __VA_ARGS__)
static int
invalid_sigprocmask_how (void)
{
int n = 0;
const int how[] = { SIG_BLOCK, SIG_UNBLOCK, SIG_SETMASK };
for (int i = 0; i < array_length (how); i++)
if (how[i] == n)
n++;
return n;
}
static int
do_test (void)
{
@ -133,10 +144,13 @@ do_test (void)
struct sched_param sch_param;
struct timespec ts;
struct timeval tv;
sigset_t sigs;
unsigned char vec[16];
ss.ss_flags = ~SS_DISABLE;
ts.tv_sec = -1;
sigemptyset (&sigs);
int fails = 0;
fails |= test_wrp (EINVAL, epoll_create, -1);
fails |= test_wrp (EINVAL, epoll_create1, EPOLL_CLOEXEC + 1);
@ -175,6 +189,11 @@ do_test (void)
fails |= test_wrp (EBADF, sendfile, -1, -1, &off, 0);
fails |= test_wrp (EINVAL, sigaltstack, &ss, NULL);
fails |= test_wrp (ECHILD, wait4, -1, &status, 0, NULL);
/* Austin Group issue #1132 states EINVAL should be returned for invalid
how argument iff the new set mask is non-null. And Linux follows the
standard on this regard. */
fails |= test_wrp (EINVAL, sigprocmask, invalid_sigprocmask_how (), &sigs,
NULL);
return fails;
}