projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add C11 mutex functions
[musl]
/
src
/
thread
/
synccall.c
diff --git
a/src/thread/synccall.c
b/src/thread/synccall.c
index
91ac5eb
..
c414990
100644
(file)
--- a/
src/thread/synccall.c
+++ b/
src/thread/synccall.c
@@
-1,34
+1,24
@@
#include "pthread_impl.h"
#include <semaphore.h>
#include "pthread_impl.h"
#include <semaphore.h>
+#include <unistd.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)
{
struct chain ch;
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;
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);
sem_init(&ch.sem, 0, 0);
sem_init(&ch.sem2, 0, 0);
@@
-49,23
+39,23
@@
static void handler(int sig, siginfo_t *si, void *ctx)
void __synccall(void (*func)(void *), void *ctx)
{
void __synccall(void (*func)(void *), void *ctx)
{
- pthread_t self;
struct sigaction sa;
struct sigaction sa;
- struct chain *
cur, *
next;
-
uint64
_t oldmask;
+ struct chain *next;
+
sigset
_t oldmask;
if (!libc.threads_minus_1) {
func(ctx);
return;
}
if (!libc.threads_minus_1) {
func(ctx);
return;
}
-
pthread_rwlock_wrlock(&lock
);
+
__inhibit_ptc(
);
- __
syscall(SYS_rt_sigprocmask, SIG_BLOCK, (uint64_t[]){-1}, &oldmask, 8
);
+ __
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;
@@
-74,10
+64,13
@@
void __synccall(void (*func)(void *), void *ctx)
sigfillset(&sa.sa_mask);
__libc_sigaction(SIGSYNCCALL, &sa, 0);
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));
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));
@@
-89,21
+82,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, 8);
-
- pthread_rwlock_unlock(&lock);
-}
+ __restore_sigs(&oldmask);
-void __synccall_lock()
-{
- pthread_rwlock_rdlock(&lock);
-}
-
-void __synccall_unlock()
-{
- pthread_rwlock_unlock(&lock);
+ __release_ptc();
}
}