clean up sloppy nested inclusion from pthread_impl.h

[musl] / src / thread / synccall.c

diff --git a/src/thread/synccall.c b/src/thread/synccall.c
index 1520b3b..dc59863 100644 (file)
--- 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)
 {
@@ -59,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);
@@ -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();
 }