X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Ftime%2Ftimer_create.c;h=f76b9ef8f3e64412621996b020b0dd2b72670543;hp=c107e150d12a66794cb274b3b4066af9e2b6fe0b;hb=cc11b422864f0eba97f8bc170e2c8275397bdf41;hpb=2063c4cac27f118c21dcb9352e8a4903131c88c8

diff --git a/src/time/timer_create.c b/src/time/timer_create.c
index c107e150..f76b9ef8 100644
--- 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 {
@@ -21,28 +22,45 @@ 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;
-	__pthread_tsd_run_dtors(self);
+	self->canceldisable = 0;
+	self->cancelasync = 0;
+	self->unblock_cancel = 0;
 	longjmp(p, 1);
 }
 
-void __sigtimer_handler(pthread_t self)
+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)) return;
-	pthread_cleanup_push(cleanup_fromsig, jb);
-	notify(val);
-	pthread_cleanup_pop(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. */
@@ -50,14 +68,18 @@ 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;
 	pthread_attr_t attr;
 	int r;
@@ -77,9 +99,10 @@ 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);
 		if (evp->sigev_notify_attributes)
 			attr = *evp->sigev_notify_attributes;
 		else
@@ -93,7 +116,7 @@ int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
 			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);
@@ -102,7 +125,7 @@ int timer_create(clockid_t clk, struct sigevent *evp, timer_t *res)
 			pthread_cancel(td);
 			return -1;
 		}
-		td->result = (void *)timerid;
+		td->result = (void *)(intptr_t)timerid;
 		*res = td;
 		break;
 	default: