projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement PT_GNU_RELRO support
[musl]
/
src
/
thread
/
synccall.c
diff --git
a/src/thread/synccall.c
b/src/thread/synccall.c
index
dc59863
..
a21578d
100644
(file)
--- a/
src/thread/synccall.c
+++ b/
src/thread/synccall.c
@@
-1,6
+1,5
@@
#include "pthread_impl.h"
#include <semaphore.h>
#include "pthread_impl.h"
#include <semaphore.h>
-#include <string.h>
static struct chain {
struct chain *next;
static struct chain {
struct chain *next;
@@
-21,15
+20,6
@@
static void handler(int sig, siginfo_t *si, void *ctx)
sigqueue(self->pid, SIGSYNCCALL, (union sigval){0});
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);
sem_init(&ch.sem, 0, 0);
sem_init(&ch.sem2, 0, 0);
@@
-52,7
+42,7
@@
void __synccall(void (*func)(void *), void *ctx)
pthread_t self;
struct sigaction sa;
struct chain *next;
pthread_t self;
struct sigaction sa;
struct chain *next;
-
uint64
_t oldmask;
+
sigset
_t oldmask;
if (!libc.threads_minus_1) {
func(ctx);
if (!libc.threads_minus_1) {
func(ctx);
@@
-61,12
+51,12
@@
void __synccall(void (*func)(void *), void *ctx)
__inhibit_ptc();
__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;
sem_init(&chaindone, 0, 0);
sem_init(&chainlock, 0, 1);
chainlen = 0;
+ head = 0;
callback = func;
context = ctx;
callback = func;
context = ctx;
@@
-79,6
+69,10
@@
void __synccall(void (*func)(void *), void *ctx)
sigqueue(self->pid, SIGSYNCCALL, (union sigval){0});
while (sem_wait(&chaindone));
sigqueue(self->pid, 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));
for (cur=head; cur; cur=cur->next) {
sem_post(&cur->sem);
while (sem_wait(&cur->sem2));
@@
-90,12
+84,7
@@
void __synccall(void (*func)(void *), void *ctx)
sem_post(&cur->sem);
}
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();
}
__release_ptc();
}