eliminate use of cached pid from thread structure

[musl] / src / thread / synccall.c

diff --git a/src/thread/synccall.c b/src/thread/synccall.c
index 2b7eac2..c414990 100644 (file)
--- a/src/thread/synccall.c
+++ b/src/thread/synccall.c
@@ -1,5 +1,6 @@
 #include "pthread_impl.h"
 #include <semaphore.h>
+#include <unistd.h>
 
 static struct chain {
        struct chain *next;
@@ -13,21 +14,11 @@ static sem_t chainlock, chaindone;
 static void handler(int sig, siginfo_t *si, void *ctx)
 {
        struct chain ch;
-       pthread_t self = __pthread_self();
        int old_errno = errno;
 
        if (chainlen == libc.threads_minus_1) return;
 
-       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;
-       }
+       sigqueue(getpid(), SIGSYNCCALL, (union sigval){0});
 
        sem_init(&ch.sem, 0, 0);
        sem_init(&ch.sem2, 0, 0);
@@ -48,10 +39,9 @@ static void handler(int sig, siginfo_t *si, void *ctx)
 
 void __synccall(void (*func)(void *), void *ctx)
 {
-       pthread_t self;
        struct sigaction sa;
        struct chain *next;
-       uint64_t oldmask;
+       sigset_t oldmask;
 
        if (!libc.threads_minus_1) {
                func(ctx);
@@ -60,12 +50,12 @@ void __synccall(void (*func)(void *), void *ctx)
 
        __inhibit_ptc();
 
-       __syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGALL_SET,
-               &oldmask, __SYSCALL_SSLEN);
+       __block_all_sigs(&oldmask);
 
        sem_init(&chaindone, 0, 0);
        sem_init(&chainlock, 0, 1);
        chainlen = 0;
+       head = 0;
        callback = func;
        context = ctx;
 
@@ -74,10 +64,13 @@ void __synccall(void (*func)(void *), void *ctx)
        sigfillset(&sa.sa_mask);
        __libc_sigaction(SIGSYNCCALL, &sa, 0);
 
-       self = __pthread_self();
-       sigqueue(self->pid, SIGSYNCCALL, (union sigval){0});
+       sigqueue(getpid(), SIGSYNCCALL, (union sigval){0});
        while (sem_wait(&chaindone));
 
+       sa.sa_flags = 0;
+       sa.sa_handler = SIG_IGN;
+       __libc_sigaction(SIGSYNCCALL, &sa, 0);
+
        for (cur=head; cur; cur=cur->next) {
                sem_post(&cur->sem);
                while (sem_wait(&cur->sem2));
@@ -89,12 +82,7 @@ void __synccall(void (*func)(void *), void *ctx)
                sem_post(&cur->sem);
        }
 
-       sa.sa_flags = 0;
-       sa.sa_handler = SIG_IGN;
-       __libc_sigaction(SIGSYNCCALL, &sa, 0);
-
-       __syscall(SYS_rt_sigprocmask, SIG_SETMASK,
-               &oldmask, 0, __SYSCALL_SSLEN);
+       __restore_sigs(&oldmask);
 
        __release_ptc();
 }