for SIGEV_THREAD timer threads, replace signal handler with sigwaitinfo

[musl] / src / time / timer_delete.c

diff --git a/src/time/timer_delete.c b/src/time/timer_delete.c
index d7c7670..b0bfac0 100644 (file)
--- a/src/time/timer_delete.c
+++ b/src/time/timer_delete.c
@@ -1,12 +1,14 @@
 #include <time.h>
+#include <limits.h>
 #include "pthread_impl.h"
 
 int timer_delete(timer_t t)
 {
-       if (t->thread) pthread_cancel(t->thread);
-       else {
-               if (t->timerid >= 0) __syscall(SYS_timer_delete, t->timerid);
-               free(t);
+       if ((intptr_t)t < 0) {
+               pthread_t td = (void *)((uintptr_t)t << 1);
+               a_store(&td->timer_id, td->timer_id | INT_MIN);
+               __syscall(SYS_tkill, td->tid, SIGTIMER);
+               return 0;
        }
-       return 0;
+       return __syscall(SYS_timer_delete, t);
 }