getservbyport_r: fix wrong result if getnameinfo fails with EAI_OVERFLOW

[musl] / src / time / timer_create.c

diff --git a/src/time/timer_create.c b/src/time/timer_create.c
index c5e40a1..cd32c94 100644 (file)
--- a/src/time/timer_create.c
+++ b/src/time/timer_create.c
@@ -1,6 +1,8 @@
 #include <time.h>
 #include <setjmp.h>
+#include <limits.h>
 #include "pthread_impl.h"
+#include "atomic.h"
 
 struct ksigevent {
        union sigval sigev_value;
@@ -31,30 +33,18 @@ static void cleanup_fromsig(void *p)
        longjmp(p, 1);
 }
 
-static void timer_handler(int sig, siginfo_t *si, void *ctx)
-{
-}
-
-static void install_handler()
-{
-       struct sigaction sa = {
-               .sa_sigaction = timer_handler,
-               .sa_flags = SA_SIGINFO | SA_RESTART
-       };
-       __libc_sigaction(SIGTIMER, &sa, 0);
-}
-
 static void *start(void *arg)
 {
        pthread_t self = __pthread_self();
        struct start_args *args = arg;
-       int id = self->timer_id;
        jmp_buf jb;
 
        void (*notify)(union sigval) = args->sev->sigev_notify_function;
        union sigval val = args->sev->sigev_value;
 
        pthread_barrier_wait(&args->b);
+       if (self->cancel)
+               return 0;
        for (;;) {
                siginfo_t si;
                while (sigwaitinfo(SIGTIMER_SET, &si) < 0);
@@ -65,13 +55,13 @@ static void *start(void *arg)
                }
                if (self->timer_id < 0) break;
        }
-       __syscall(SYS_timer_delete, id);
+       __syscall(SYS_timer_delete, self->timer_id & INT_MAX);
        return 0;
 }
 
 int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict res)
 {
-       static pthread_once_t once = PTHREAD_ONCE_INIT;
+       volatile static int init = 0;
        pthread_t td;
        pthread_attr_t attr;
        int r;
@@ -83,11 +73,15 @@ int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict
        switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) {
        case SIGEV_NONE:
        case SIGEV_SIGNAL:
+       case SIGEV_THREAD_ID:
                if (evp) {
                        ksev.sigev_value = evp->sigev_value;
                        ksev.sigev_signo = evp->sigev_signo;
                        ksev.sigev_notify = evp->sigev_notify;
-                       ksev.sigev_tid = 0;
+                       if (evp->sigev_notify == SIGEV_THREAD_ID)
+                               ksev.sigev_tid = evp->sigev_notify_thread_id;
+                       else
+                               ksev.sigev_tid = 0;
                        ksevp = &ksev;
                }
                if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0)
@@ -95,7 +89,11 @@ int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict
                *res = (void *)(intptr_t)timerid;
                break;
        case SIGEV_THREAD:
-               pthread_once(&once, install_handler);
+               if (!init) {
+                       struct sigaction sa = { .sa_handler = SIG_DFL };
+                       __libc_sigaction(SIGTIMER, &sa, 0);
+                       a_store(&init, 1);
+               }
                if (evp->sigev_notify_attributes)
                        attr = *evp->sigev_notify_attributes;
                else
@@ -115,10 +113,12 @@ int timer_create(clockid_t clk, struct sigevent *restrict evp, timer_t *restrict
 
                ksev.sigev_value.sival_ptr = 0;
                ksev.sigev_signo = SIGTIMER;
-               ksev.sigev_notify = 4; /* SIGEV_THREAD_ID */
+               ksev.sigev_notify = SIGEV_THREAD_ID;
                ksev.sigev_tid = td->tid;
-               if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0)
+               if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0) {
                        timerid = -1;
+                       td->cancel = 1;
+               }
                td->timer_id = timerid;
                pthread_barrier_wait(&args.b);
                if (timerid < 0) return -1;