X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_create.c;h=52487001484ce8c1edfc08cd7b7027055c4a130d;hp=6f1bb0e8172b3c8045b4fa0867071c3118dd1e6c;hb=729cb49f52c825ac44f437e1ff0865d9f0b3626a;hpb=fd80cfa00b34ec81b3049b98c66f6a45301ca6c4

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 6f1bb0e8..52487001 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -4,6 +4,7 @@ static void dummy_1(pthread_t self)
 {
 }
 weak_alias(dummy_1, __pthread_tsd_run_dtors);
+weak_alias(dummy_1, __sigtimer_handler);
 
 #ifdef __pthread_unwind_next
 #undef __pthread_unwind_next
@@ -47,22 +48,28 @@ static void docancel(struct pthread *self)
 static void cancel_handler(int sig, siginfo_t *si, void *ctx)
 {
 	struct pthread *self = __pthread_self();
-	if (!self->cancel) {
-		if (si->si_code == SI_TIMER && libc.sigtimer)
-			libc.sigtimer(sig, si, ctx);
-		return;
-	}
-	if (self->canceldisable) return;
-	if (self->cancelasync || (self->cancelpoint==1 && PC_AT_SYS(ctx)))
+	if (si->si_code == SI_TIMER) __sigtimer_handler(self);
+	if (self->cancel && !self->canceldisable &&
+	    (self->cancelasync || (self->cancelpoint==1 && PC_AT_SYS(ctx))))
 		docancel(self);
 }
 
 static void cancelpt(int x)
 {
 	struct pthread *self = __pthread_self();
-	if (self->canceldisable) return;
-	if ((self->cancelpoint+=x)==1 && x>=0 && self->cancel)
-		docancel(self);
+	switch (x) {
+	case 1:
+		self->cancelpoint++;
+	case 0:
+		if (self->cancel && self->cancelpoint==1 && !self->canceldisable)
+			docancel(self);
+		break;
+	case -1:
+		self->cancelpoint--;
+		break;
+	default:
+		self->canceldisable += x;
+	}
 }
 
 /* "rsyscall" is a mechanism by which a thread can synchronously force all
@@ -83,13 +90,12 @@ static void rsyscall_handler(int sig, siginfo_t *si, void *ctx)
 {
 	struct pthread *self = __pthread_self();
 
-	if (si->si_code > 0 || si->si_pid != self->pid ||
-		rs.cnt == libc.threads_minus_1) return;
+	if (!rs.hold || rs.cnt == libc.threads_minus_1) return;
 
 	/* Threads which have already decremented themselves from the
 	 * thread count must not increment rs.cnt or otherwise act. */
 	if (self->dead) {
-		__wait(&rs.hold, 0, 1, 1);
+		sigfillset(&((ucontext_t *)ctx)->uc_sigmask);
 		return;
 	}
 
@@ -121,9 +127,9 @@ static int rsyscall(int nr, long a, long b, long c, long d, long e, long f)
 	rs.arg[0] = a; rs.arg[1] = b;
 	rs.arg[2] = c; rs.arg[3] = d;
 	rs.arg[4] = d; rs.arg[5] = f;
-	rs.hold = 1;
 	rs.err = 0;
 	rs.cnt = 0;
+	rs.hold = 1;
 
 	/* Dispatch signals until all threads respond */
 	for (i=libc.threads_minus_1; i; i--)
@@ -155,13 +161,18 @@ static void init_threads()
 	libc.lockfile = __lockfile;
 	libc.cancelpt = cancelpt;
 	libc.rsyscall = rsyscall;
+
+	sigfillset(&sa.sa_mask);
+	sa.sa_sigaction = rsyscall_handler;
+	__libc_sigaction(SIGSYSCALL, &sa, 0);
+
+	sigemptyset(&sa.sa_mask);
 	sa.sa_sigaction = cancel_handler;
 	__libc_sigaction(SIGCANCEL, &sa, 0);
+
 	sigaddset(&sa.sa_mask, SIGSYSCALL);
 	sigaddset(&sa.sa_mask, SIGCANCEL);
-	sa.sa_sigaction = rsyscall_handler;
-	__libc_sigaction(SIGSYSCALL, &sa, 0);
-	sigprocmask(SIG_UNBLOCK, &sa.sa_mask, 0);
+	__libc_sigprocmask(SIG_UNBLOCK, &sa.sa_mask, 0);
 }
 
 static int start(void *p)
@@ -194,7 +205,7 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	unsigned char *map, *stack, *tsd;
 	static const pthread_attr_t default_attr;
 
-	if (!self) return errno = ENOSYS;
+	if (!self) return ENOSYS;
 	if (!init && ++init) init_threads();
 
 	if (!attr) attr = &default_attr;