X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftime%2Ftimer_create.c;h=60a18c71989dd459399d7a64fac6d338c5c521bc;hb=ac562aa1ef4012f617583f474a8d8e5c972ed6ee;hp=1561d797a258608e131fe2753e74b61cfca81ab8;hpb=4c4e22d781d75a461097cccc2ecac5adbafb1a59;p=musl

diff --git a/src/time/timer_create.c b/src/time/timer_create.c
index 1561d797..60a18c71 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 {
@@ -40,7 +41,7 @@ static void timer_handler(int sig, siginfo_t *si, void *ctx)
 	if (!setjmp(jb) && si->si_code == SI_TIMER) {
 		pthread_cleanup_push(cleanup_fromsig, jb);
 		notify(val);
-		pthread_cleanup_pop(0);
+		pthread_cleanup_pop(1);
 	}
 }
 
@@ -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, __SYSCALL_SSLEN);
 }
 
 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;