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 c5894f4..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 {
@@ -13,22 +14,53 @@ struct start_args {
        struct sigevent *sev;
 };
 
-static void sighandler(int sig, siginfo_t *si, void *ctx)
+static void dummy_1(pthread_t self)
+{
+}
+weak_alias(dummy_1, __pthread_tsd_run_dtors);
+
+static void cleanup_fromsig(void *p)
+{
+       pthread_t self = __pthread_self();
+       __pthread_tsd_run_dtors(self);
+       self->cancel = 0;
+       self->cancelbuf = 0;
+       self->canceldisable = 0;
+       self->cancelasync = 0;
+       self->unblock_cancel = 0;
+       longjmp(p, 1);
+}
+
+static void timer_handler(int sig, siginfo_t *si, void *ctx)
 {
-       int st;
        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 };
 
-       pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &st);
-       notify(val);
-       pthread_setcancelstate(st, 0);
+       if (!setjmp(jb) && si->si_code == SI_TIMER) {
+               pthread_cleanup_push(cleanup_fromsig, jb);
+               notify(val);
+               pthread_cleanup_pop(1);
+       }
+}
+
+static void install_handler()
+{
+       struct sigaction sa = {
+               .sa_sigaction = timer_handler,
+               .sa_flags = SA_SIGINFO | SA_RESTART
+       };
+       __libc_sigaction(SIGTIMER, &sa, 0);
+       __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. */
@@ -36,57 +68,55 @@ 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);
-       pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0);
-       /* Loop on async-signal-safe cancellation point */
-       for (;;) sleep(1);
+       __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)
 {
-       struct sigevent sev = { 
-               .sigev_notify = SIGEV_SIGNAL,
-               .sigev_signo = SIGALRM
-       };
+       static pthread_once_t once = PTHREAD_ONCE_INIT;
        pthread_t td;
        pthread_attr_t attr;
        int r;
        struct start_args args;
-       timer_t t;
-       struct ksigevent ksev;
+       struct ksigevent ksev, *ksevp=0;
        int timerid;
 
-       if (evp) sev = *evp;
-
-       switch (sev.sigev_notify) {
+       switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) {
        case SIGEV_NONE:
        case SIGEV_SIGNAL:
-               ksev.sigev_value = evp ? sev.sigev_value
-                       : (union sigval){.sival_ptr=t};
-               ksev.sigev_signo = sev.sigev_signo;
-               ksev.sigev_notify = sev.sigev_notify;
-               ksev.sigev_tid = 0;
-               if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0)
+               if (evp) {
+                       ksev.sigev_value = evp->sigev_value;
+                       ksev.sigev_signo = evp->sigev_signo;
+                       ksev.sigev_notify = evp->sigev_notify;
+                       ksev.sigev_tid = 0;
+                       ksevp = &ksev;
+               }
+               if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0)
                        return -1;
-               *res = (void *)(2*timerid+1);
+               *res = (void *)timerid;
                break;
        case SIGEV_THREAD:
-               if (!libc.sigtimer) libc.sigtimer = sighandler;
-               if (sev.sigev_notify_attributes)
-                       attr = *sev.sigev_notify_attributes;
+               pthread_once(&once, install_handler);
+               if (evp->sigev_notify_attributes)
+                       attr = *evp->sigev_notify_attributes;
                else
                        pthread_attr_init(&attr);
                pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
                pthread_barrier_init(&args.b, 0, 2);
-               args.sev = &sev;
+               args.sev = evp;
                r = pthread_create(&td, &attr, start, &args);
                if (r) {
                        errno = r;
                        return -1;
                }
                ksev.sigev_value.sival_ptr = 0;
-               ksev.sigev_signo = SIGCANCEL;
+               ksev.sigev_signo = SIGTIMER;
                ksev.sigev_notify = 4; /* SIGEV_THREAD_ID */
                ksev.sigev_tid = td->tid;
                r = syscall(SYS_timer_create, clk, &ksev, &timerid);