for SIGEV_THREAD timer threads, replace signal handler with sigwaitinfo

[musl] / src / time / timer_create.c

diff --git a/src/time/timer_create.c b/src/time/timer_create.c
index 3bcfa95..9421957 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 {
@@ -13,35 +14,26 @@ struct start_args {
        struct sigevent *sev;
 };
 
-static void dummy_1(pthread_t self)
+static void dummy_0()
 {
 }
-weak_alias(dummy_1, __pthread_tsd_run_dtors);
+weak_alias(dummy_0, __pthread_tsd_run_dtors);
 
 static void cleanup_fromsig(void *p)
 {
        pthread_t self = __pthread_self();
-       __pthread_tsd_run_dtors(self);
+       __pthread_tsd_run_dtors();
        self->cancel = 0;
        self->cancelbuf = 0;
        self->canceldisable = 0;
        self->cancelasync = 0;
        self->unblock_cancel = 0;
+       __reset_tls();
        longjmp(p, 1);
 }
 
 static void timer_handler(int sig, siginfo_t *si, void *ctx)
 {
-       pthread_t self = __pthread_self();
-       jmp_buf jb;
-       void (*notify)(union sigval) = (void (*)(union sigval))self->start;
-       union sigval val = { .sival_ptr = self->start_arg };
-
-       if (!setjmp(jb) && si->si_code == SI_TIMER) {
-               pthread_cleanup_push(cleanup_fromsig, jb);
-               notify(val);
-               pthread_cleanup_pop(0);
-       }
 }
 
 static void install_handler()
@@ -51,27 +43,34 @@ 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);
 }
 
 static void *start(void *arg)
 {
        pthread_t self = __pthread_self();
        struct start_args *args = arg;
+       int id = self->timer_id;
+       jmp_buf jb;
 
-       /* Reuse no-longer-needed thread structure fields to avoid
-        * needing the timer address in the signal handler. */
-       self->start = (void *(*)(void *))args->sev->sigev_notify_function;
-       self->start_arg = args->sev->sigev_value.sival_ptr;
-       self->result = (void *)-1;
+       void (*notify)(union sigval) = args->sev->sigev_notify_function;
+       union sigval val = args->sev->sigev_value;
 
        pthread_barrier_wait(&args->b);
-       __wait(&self->delete_timer, 0, 0, 1);
-       __syscall(SYS_timer_delete, self->result);
+       for (;;) {
+               siginfo_t si;
+               while (sigwaitinfo(SIGTIMER_SET, &si) < 0);
+               if (si.si_code == SI_TIMER && !setjmp(jb)) {
+                       pthread_cleanup_push(cleanup_fromsig, jb);
+                       notify(val);
+                       pthread_cleanup_pop(1);
+               }
+               if (self->timer_id < 0) break;
+       }
+       __syscall(SYS_timer_delete, id);
        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,6 +79,7 @@ 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:
@@ -93,7 +93,7 @@ int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
                }
                if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0)
                        return -1;
-               *res = (void *)timerid;
+               *res = (void *)(intptr_t)timerid;
                break;
        case SIGEV_THREAD:
                pthread_once(&once, install_handler);
@@ -104,23 +104,26 @@ 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;
+
+               __block_app_sigs(&set);
+               __syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGTIMER_SET, 0, _NSIG/8);
                r = pthread_create(&td, &attr, start, &args);
+               __restore_sigs(&set);
                if (r) {
                        errno = r;
                        return -1;
                }
+
                ksev.sigev_value.sival_ptr = 0;
                ksev.sigev_signo = SIGTIMER;
                ksev.sigev_notify = 4; /* SIGEV_THREAD_ID */
                ksev.sigev_tid = td->tid;
-               r = syscall(SYS_timer_create, clk, &ksev, &timerid);
+               if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0)
+                       timerid = -1;
+               td->timer_id = timerid;
                pthread_barrier_wait(&args.b);
-               if (r < 0) {
-                       pthread_cancel(td);
-                       return -1;
-               }
-               td->result = (void *)timerid;
-               *res = td;
+               if (timerid < 0) return -1;
+               *res = (void *)(INTPTR_MIN | (uintptr_t)td>>1);
                break;
        default:
                errno = EINVAL;