X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fsynccall.c;h=dc59863f11c3c7ae49073a673fba9a854c668ae0;hb=dd959163828bda8b03e699de95298fffb2329bb9;hp=2cd25e4bb2b84315ca4adb9c562d4592eebcb55a;hpb=407d933052c310ebc5541dae2ecd8c4bd8f55fb9;p=musl

diff --git a/src/thread/synccall.c b/src/thread/synccall.c
index 2cd25e4b..dc59863f 100644
--- a/src/thread/synccall.c
+++ b/src/thread/synccall.c
@@ -1,5 +1,6 @@
 #include "pthread_impl.h"
 #include <semaphore.h>
+#include <string.h>
 
 static struct chain {
 	struct chain *next;
@@ -9,7 +10,6 @@ static struct chain {
 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)
 {
@@ -47,14 +47,6 @@ static void handler(int sig, siginfo_t *si, void *ctx)
 	errno = old_errno;
 }
 
-void __synccall_wait()
-{
-	struct chain *ch = cur;
-	sem_post(&ch->sem2);
-	while (sem_wait(&ch->sem));
-	sem_post(&ch->sem);
-}
-
 void __synccall(void (*func)(void *), void *ctx)
 {
 	pthread_t self;
@@ -67,9 +59,10 @@ void __synccall(void (*func)(void *), void *ctx)
 		return;
 	}
 
-	pthread_rwlock_wrlock(&lock);
+	__inhibit_ptc();
 
-	__syscall(SYS_rt_sigprocmask, SIG_BLOCK, (uint64_t[]){-1}, &oldmask, 8);
+	__syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGALL_SET,
+		&oldmask, __SYSCALL_SSLEN);
 
 	sem_init(&chaindone, 0, 0);
 	sem_init(&chainlock, 0, 1);
@@ -101,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);
-
-	pthread_rwlock_unlock(&lock);
-}
+	__syscall(SYS_rt_sigprocmask, SIG_SETMASK,
+		&oldmask, 0, __SYSCALL_SSLEN);
 
-void __synccall_lock()
-{
-	pthread_rwlock_rdlock(&lock);
-}
-
-void __synccall_unlock()
-{
-	pthread_rwlock_unlock(&lock);
+	__release_ptc();
 }