projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regex: remove an unused local variable from regexec
[musl]
/
src
/
thread
/
synccall.c
diff --git
a/src/thread/synccall.c
b/src/thread/synccall.c
index
7c4f92b
..
dc59863
100644
(file)
--- a/
src/thread/synccall.c
+++ b/
src/thread/synccall.c
@@
-1,15
+1,15
@@
#include "pthread_impl.h"
#include <semaphore.h>
#include "pthread_impl.h"
#include <semaphore.h>
+#include <string.h>
static struct chain {
struct chain *next;
sem_t sem, sem2;
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 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)
{
static void handler(int sig, siginfo_t *si, void *ctx)
{
@@
-51,18
+51,19
@@
void __synccall(void (*func)(void *), void *ctx)
{
pthread_t self;
struct sigaction sa;
{
pthread_t self;
struct sigaction sa;
- struct chain *
cur, *
next;
+ struct chain *next;
uint64_t oldmask;
uint64_t oldmask;
- pthread_rwlock_wrlock(&lock);
-
- __syscall(SYS_rt_sigprocmask, SIG_BLOCK, (uint64_t[]){-1}, &oldmask, 8);
-
if (!libc.threads_minus_1) {
func(ctx);
return;
}
if (!libc.threads_minus_1) {
func(ctx);
return;
}
+ __inhibit_ptc();
+
+ __syscall(SYS_rt_sigprocmask, SIG_BLOCK, SIGALL_SET,
+ &oldmask, __SYSCALL_SSLEN);
+
sem_init(&chaindone, 0, 0);
sem_init(&chainlock, 0, 1);
chainlen = 0;
sem_init(&chaindone, 0, 0);
sem_init(&chainlock, 0, 1);
chainlen = 0;
@@
-93,17
+94,8
@@
void __synccall(void (*func)(void *), void *ctx)
sa.sa_handler = SIG_IGN;
__libc_sigaction(SIGSYNCCALL, &sa, 0);
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();
}
}