X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fsynccall.c;h=dc59863f11c3c7ae49073a673fba9a854c668ae0;hb=121e3a38a1d0b324696fc1671029e4b815ea7fa4;hp=7c4f92bfdb77307338778a27adca3e9dd5ca07ad;hpb=acb04806628990ad2430e04261dd20f23babde5e;p=musl

diff --git a/src/thread/synccall.c b/src/thread/synccall.c
index 7c4f92bf..dc59863f 100644
--- a/src/thread/synccall.c
+++ b/src/thread/synccall.c
@@ -1,15 +1,15 @@
 #include "pthread_impl.h"
 #include <semaphore.h>
+#include <string.h>
 
 static struct chain {
 	struct chain *next;
 	sem_t sem, sem2;
-} *head;
+} *head, *cur;
 
 static void (*callback)(void *), *context;
 static int chainlen;
 static sem_t chainlock, chaindone;
-static pthread_rwlock_t lock = PTHREAD_RWLOCK_INITIALIZER;
 
 static void handler(int sig, siginfo_t *si, void *ctx)
 {
@@ -51,18 +51,19 @@ void __synccall(void (*func)(void *), void *ctx)
 {
 	pthread_t self;
 	struct sigaction sa;
-	struct chain *cur, *next;
+	struct chain *next;
 	uint64_t oldmask;
 
-	pthread_rwlock_wrlock(&lock);
-
-	__syscall(SYS_rt_sigprocmask, SIG_BLOCK, (uint64_t[]){-1}, &oldmask, 8);
-
 	if (!libc.threads_minus_1) {
 		func(ctx);
 		return;
 	}
 
+	__inhibit_ptc();
+
+	__syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGALL_SET,
+		&oldmask, __SYSCALL_SSLEN);
+
 	sem_init(&chaindone, 0, 0);
 	sem_init(&chainlock, 0, 1);
 	chainlen = 0;
@@ -93,17 +94,8 @@ void __synccall(void (*func)(void *), void *ctx)
 	sa.sa_handler = SIG_IGN;
 	__libc_sigaction(SIGSYNCCALL, &sa, 0);
 
-	__syscall(SYS_rt_sigprocmask, SIG_SETMASK, &oldmask, 0, 8);
+	__syscall(SYS_rt_sigprocmask, SIG_SETMASK,
+		&oldmask, 0, __SYSCALL_SSLEN);
 
-	pthread_rwlock_unlock(&lock);
-}
-
-void __synccall_lock()
-{
-	pthread_rwlock_rdlock(&lock);
-}
-
-void __synccall_unlock()
-{
-	pthread_rwlock_unlock(&lock);
+	__release_ptc();
 }