X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftime%2Ftimer_create.c;h=4bef23905103e6853305076cb0096f25f089d8a3;hb=7edbcbeb76cb46381c34e2c0491dcc459cd5fa46;hp=2abec278da6075d64261b94aa13237d7be837bc5;hpb=680630011d38eb9f96f92b2f080cc60f38f6df21;p=musl

diff --git a/src/time/timer_create.c b/src/time/timer_create.c
index 2abec278..4bef2390 100644
--- a/src/time/timer_create.c
+++ b/src/time/timer_create.c
@@ -1,5 +1,8 @@
 #include <time.h>
+#include <setjmp.h>
+#include <limits.h>
 #include "pthread_impl.h"
+#include "atomic.h"
 
 struct ksigevent {
 	union sigval sigev_value;
@@ -11,108 +14,116 @@ struct ksigevent {
 struct start_args {
 	pthread_barrier_t b;
 	struct sigevent *sev;
-	timer_t t;
 };
 
-static void sighandler(int sig, siginfo_t *si, void *ctx)
+static void dummy_0()
 {
-	int st;
-	timer_t t = si->si_value.sival_ptr;
-	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &st);
-	t->notify(t->val);
-	pthread_setcancelstate(st, 0);
 }
+weak_alias(dummy_0, __pthread_tsd_run_dtors);
 
-static void killtimer(void *arg)
+static void cleanup_fromsig(void *p)
 {
-	timer_t t = arg;
-	if (t->timerid >= 0) __syscall(SYS_timer_delete, t->timerid);
+	pthread_t self = __pthread_self();
+	__pthread_tsd_run_dtors();
+	self->cancel = 0;
+	self->cancelbuf = 0;
+	self->canceldisable = 0;
+	self->cancelasync = 0;
+	__reset_tls();
+	longjmp(p, 1);
 }
 
 static void *start(void *arg)
 {
+	pthread_t self = __pthread_self();
 	struct start_args *args = arg;
-	struct __timer t = {
-		.notify = args->sev->sigev_notify_function,
-		.val = args->sev->sigev_value,
-	};
+	jmp_buf jb;
 
-	args->t = &t;
+	void (*notify)(union sigval) = args->sev->sigev_notify_function;
+	union sigval val = args->sev->sigev_value;
 
 	pthread_barrier_wait(&args->b);
-
-	pthread_cleanup_push(killtimer, &t);
-	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0);
-	/* Loop on async-signal-safe cancellation point */
-	for (;;) sleep(1);
-	pthread_cleanup_pop(1);
+	for (;;) {
+		siginfo_t si;
+		while (sigwaitinfo(SIGTIMER_SET, &si) < 0);
+		if (si.si_code == SI_TIMER && !setjmp(jb)) {
+			pthread_cleanup_push(cleanup_fromsig, jb);
+			notify(val);
+			pthread_cleanup_pop(1);
+		}
+		if (self->timer_id < 0) break;
+	}
+	__syscall(SYS_timer_delete, self->timer_id & INT_MAX);
 	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)
 {
-	struct sigevent sev = { 
-		.sigev_notify = SIGEV_SIGNAL,
-		.sigev_signo = SIGALRM
-	};
+	volatile static int init = 0;
 	pthread_t td;
 	pthread_attr_t attr;
 	int r;
 	struct start_args args;
-	timer_t t;
-	struct ksigevent ksev;
+	struct ksigevent ksev, *ksevp=0;
 	int timerid;
+	sigset_t set;
 
-	if (evp) sev = *evp;
-
-	switch (sev.sigev_notify) {
+	switch (evp ? evp->sigev_notify : SIGEV_SIGNAL) {
 	case SIGEV_NONE:
 	case SIGEV_SIGNAL:
-		ksev.sigev_value = evp ? sev.sigev_value
-			: (union sigval){.sival_ptr=t};
-		ksev.sigev_signo = sev.sigev_signo;
-		ksev.sigev_notify = sev.sigev_notify;
-		ksev.sigev_tid = 0;
-		if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0)
-			return -1;
-		if (!(t = calloc(1, sizeof *t))) {
-			syscall(SYS_timer_delete, timerid);
-			return -1;
+	case SIGEV_THREAD_ID:
+		if (evp) {
+			ksev.sigev_value = evp->sigev_value;
+			ksev.sigev_signo = evp->sigev_signo;
+			ksev.sigev_notify = evp->sigev_notify;
+			if (evp->sigev_notify == SIGEV_THREAD_ID)
+				ksev.sigev_tid = evp->sigev_notify_thread_id;
+			else
+				ksev.sigev_tid = 0;
+			ksevp = &ksev;
 		}
-		t->timerid = timerid;
+		if (syscall(SYS_timer_create, clk, ksevp, &timerid) < 0)
+			return -1;
+		*res = (void *)(intptr_t)timerid;
 		break;
 	case SIGEV_THREAD:
-		if (!libc.sigtimer) libc.sigtimer = sighandler;
-		if (sev.sigev_notify_attributes)
-			attr = *sev.sigev_notify_attributes;
+		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
 			pthread_attr_init(&attr);
 		pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 		pthread_barrier_init(&args.b, 0, 2);
-		args.sev = &sev;
+		args.sev = evp;
+
+		__block_app_sigs(&set);
+		__syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGTIMER_SET, 0, _NSIG/8);
 		r = pthread_create(&td, &attr, start, &args);
+		__restore_sigs(&set);
 		if (r) {
 			errno = r;
 			return -1;
 		}
-		pthread_barrier_wait(&args.b);
-		t = args.t;
-		t->thread = td;
-		ksev.sigev_value.sival_ptr = t;
-		ksev.sigev_signo = SIGCANCEL;
-		ksev.sigev_notify = 4; /* SIGEV_THREAD_ID */
+
+		ksev.sigev_value.sival_ptr = 0;
+		ksev.sigev_signo = SIGTIMER;
+		ksev.sigev_notify = SIGEV_THREAD_ID;
 		ksev.sigev_tid = td->tid;
-		if (syscall(SYS_timer_create, clk, &ksev, &t->timerid) < 0) {
-			t->timerid = -1;
-			pthread_cancel(td);
-			return -1;
-		}
+		if (syscall(SYS_timer_create, clk, &ksev, &timerid) < 0)
+			timerid = -1;
+		td->timer_id = timerid;
+		pthread_barrier_wait(&args.b);
+		if (timerid < 0) return -1;
+		*res = (void *)(INTPTR_MIN | (uintptr_t)td>>1);
 		break;
 	default:
 		errno = EINVAL;
 		return -1;
 	}
 
-	*res = t;
 	return 0;
 }