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

diff --git a/src/time/timer_create.c b/src/time/timer_create.c
index f596b0fe..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 {
@@ -51,13 +52,15 @@ 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);
+	__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. */
@@ -65,13 +68,16 @@ 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;
@@ -80,7 +86,6 @@ 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:
@@ -94,7 +99,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);
@@ -105,10 +110,7 @@ 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;
-		sigfillset(&set);
-		pthread_sigmask(SIG_BLOCK, &set, &set);
 		r = pthread_create(&td, &attr, start, &args);
-		pthread_sigmask(SIG_SETMASK, &set, 0);
 		if (r) {
 			errno = r;
 			return -1;
@@ -123,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: