remove __SYSCALL_SSLEN arch macro in favor of using public _NSIG

[musl] / src / time / timer_create.c

diff --git a/src/time/timer_create.c b/src/time/timer_create.c
index 593f73a..6cc2bcf 100644 (file)
--- a/src/time/timer_create.c
+++ b/src/time/timer_create.c
@@ -1,4 +1,5 @@
 #include <time.h>
+#include <setjmp.h>
 #include "pthread_impl.h"
 
 struct ksigevent {
@@ -40,7 +41,7 @@ static void timer_handler(int sig, siginfo_t *si, void *ctx)
        if (!setjmp(jb) && si->si_code == SI_TIMER) {
                pthread_cleanup_push(cleanup_fromsig, jb);
                notify(val);
-               pthread_cleanup_pop(0);
+               pthread_cleanup_pop(1);
        }
 }
 
@@ -51,13 +52,15 @@ static void install_handler()
                .sa_flags = SA_SIGINFO | SA_RESTART
        };
        __libc_sigaction(SIGTIMER, &sa, 0);
-       __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGTIMER_SET, 0, 8);
+       __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+               SIGTIMER_SET, 0, _NSIG/8);
 }
 
 static void *start(void *arg)
 {
        pthread_t self = __pthread_self();
        struct start_args *args = arg;
+       sigset_t set;
 
        /* Reuse no-longer-needed thread structure fields to avoid
         * needing the timer address in the signal handler. */
@@ -65,13 +68,16 @@ static void *start(void *arg)
        self->start_arg = args->sev->sigev_value.sival_ptr;
        self->result = (void *)-1;
 
+       sigfillset(&set);
+       pthread_sigmask(SIG_BLOCK, &set, 0);
+
        pthread_barrier_wait(&args->b);
        __wait(&self->delete_timer, 0, 0, 1);
        __syscall(SYS_timer_delete, self->result);
        return 0;
 }
 
-int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
+int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict res)
 {
        static pthread_once_t once = PTHREAD_ONCE_INIT;
        pthread_t td;
@@ -80,7 +86,6 @@ int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
        struct start_args args;
        struct ksigevent ksev, *ksevp=0;
        int timerid;
-       sigset_t set;
 
        switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) {
        case SIGEV_NONE:
@@ -105,10 +110,7 @@ int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
                pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
                pthread_barrier_init(&args.b, 0, 2);
                args.sev = evp;
-               sigfillset(&set);
-               pthread_sigmask(SIG_BLOCK, &set, &set);
                r = pthread_create(&td, &attr, start, &args);
-               pthread_sigmask(SIG_SETMASK, &set, 0);
                if (r) {
                        errno = r;
                        return -1;