synccall signal handler need not handle dead threads anymore

[musl] / src / thread / synccall.c

diff --git a/src/thread/synccall.c b/src/thread/synccall.c
index 91ac5eb..706c8e7 100644 (file)
--- 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)
 {
@@ -21,15 +21,6 @@ static void handler(int sig, siginfo_t *si, void *ctx)
 
        sigqueue(self->pid, SIGSYNCCALL, (union sigval){0});
 
-       /* Threads which have already decremented themselves from the
-        * thread count must not act. Block further receipt of signals
-        * and return. */
-       if (self->dead) {
-               memset(&((ucontext_t *)ctx)->uc_sigmask, -1, 8);
-               errno = old_errno;
-               return;
-       }
-
        sem_init(&ch.sem, 0, 0);
        sem_init(&ch.sem2, 0, 0);
 
@@ -51,7 +42,7 @@ void __synccall(void (*func)(void *), void *ctx)
 {
        pthread_t self;
        struct sigaction sa;
-       struct chain *cur, *next;
+       struct chain *next;
        uint64_t oldmask;
 
        if (!libc.threads_minus_1) {
@@ -59,9 +50,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, _NSIG/8);
 
        sem_init(&chaindone, 0, 0);
        sem_init(&chainlock, 0, 1);
@@ -93,17 +85,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, _NSIG/8);
 
-void __synccall_lock()
-{
-       pthread_rwlock_rdlock(&lock);
-}
-
-void __synccall_unlock()
-{
-       pthread_rwlock_unlock(&lock);
+       __release_ptc();
 }