From ccc7b4c3a17ade90de71e1e0f44deebbffd646e6 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 26 Mar 2013 23:07:31 -0400 Subject: remove __SYSCALL_SSLEN arch macro in favor of using public _NSIG the issue at hand is that many syscalls require as an argument the kernel-ABI size of sigset_t, intended to allow the kernel to switch to a larger sigset_t in the future. previously, each arch was defining this size in syscall_arch.h, which was redundant with the definition of _NSIG in bits/signal.h. as it's used in some not-quite-portable application code as well, _NSIG is much more likely to be recognized and understood immediately by someone reading the code, and it's also shorter and less cluttered. note that _NSIG is actually 65/129, not 64/128, but the division takes care of throwing away the off-by-one part. --- src/thread/pthread_create.c | 10 +++++----- src/thread/pthread_self.c | 2 +- src/thread/pthread_sigmask.c | 2 +- src/thread/synccall.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/thread') diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index d11dcfaf..059c20e7 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -40,7 +40,7 @@ _Noreturn void pthread_exit(void *result) if (self->detached == 2) __syscall(SYS_set_tid_address, 0); __syscall(SYS_rt_sigprocmask, SIG_BLOCK, - SIGALL_SET, 0, __SYSCALL_SSLEN); + SIGALL_SET, 0, _NSIG/8); __unmapself(self->map_base, self->map_size); } @@ -69,11 +69,11 @@ static int start(void *p) pthread_exit(0); } __syscall(SYS_rt_sigprocmask, SIG_SETMASK, - self->sigmask, 0, __SYSCALL_SSLEN); + self->sigmask, 0, _NSIG/8); } if (self->unblock_cancel) __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, - SIGPT_SET, 0, __SYSCALL_SSLEN); + SIGPT_SET, 0, _NSIG/8); pthread_exit(self->start(self->start_arg)); return 0; } @@ -171,7 +171,7 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp if (attr._a_sched) { do_sched = new->startlock[0] = 1; __syscall(SYS_rt_sigprocmask, SIG_BLOCK, - SIGALL_SET, self->sigmask, __SYSCALL_SSLEN); + SIGALL_SET, self->sigmask, _NSIG/8); } new->unblock_cancel = self->cancel; new->canary = self->canary; @@ -183,7 +183,7 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp if (do_sched) { __syscall(SYS_rt_sigprocmask, SIG_SETMASK, - new->sigmask, 0, __SYSCALL_SSLEN); + new->sigmask, 0, _NSIG/8); } if (ret < 0) { diff --git a/src/thread/pthread_self.c b/src/thread/pthread_self.c index 23dbaa5e..c50a2fb5 100644 --- a/src/thread/pthread_self.c +++ b/src/thread/pthread_self.c @@ -9,7 +9,7 @@ weak_alias(dummy, __pthread_tsd_main); static int init_main_thread() { __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, - SIGPT_SET, 0, __SYSCALL_SSLEN); + SIGPT_SET, 0, _NSIG/8); if (__set_thread_area(TP_ADJ(main_thread)) < 0) return -1; main_thread->canceldisable = libc.canceldisable; main_thread->tsd = (void **)__pthread_tsd_main; diff --git a/src/thread/pthread_sigmask.c b/src/thread/pthread_sigmask.c index f6102ad4..b274bd0d 100644 --- a/src/thread/pthread_sigmask.c +++ b/src/thread/pthread_sigmask.c @@ -7,7 +7,7 @@ int pthread_sigmask(int how, const sigset_t *restrict set, sigset_t *restrict ol { int ret; if ((unsigned)how - SIG_BLOCK > 2U) return EINVAL; - ret = -__syscall(SYS_rt_sigprocmask, how, set, old, __SYSCALL_SSLEN); + ret = -__syscall(SYS_rt_sigprocmask, how, set, old, _NSIG/8); if (!ret && old) { if (sizeof old->__bits[0] == 8) { old->__bits[0] &= ~0x380000000ULL; diff --git a/src/thread/synccall.c b/src/thread/synccall.c index dc59863f..8c825ace 100644 --- a/src/thread/synccall.c +++ b/src/thread/synccall.c @@ -62,7 +62,7 @@ void __synccall(void (*func)(void *), void *ctx) __inhibit_ptc(); __syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGALL_SET, - &oldmask, __SYSCALL_SSLEN); + &oldmask, _NSIG/8); sem_init(&chaindone, 0, 0); sem_init(&chainlock, 0, 1); @@ -95,7 +95,7 @@ void __synccall(void (*func)(void *), void *ctx) __libc_sigaction(SIGSYNCCALL, &sa, 0); __syscall(SYS_rt_sigprocmask, SIG_SETMASK, - &oldmask, 0, __SYSCALL_SSLEN); + &oldmask, 0, _NSIG/8); __release_ptc(); } -- cgit v1.2.1