diff options
Diffstat (limited to 'src/thread')
| -rw-r--r-- | src/thread/pthread_create.c | 6 | ||||
| -rw-r--r-- | src/thread/synccall.c | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index 7be58b99..bef25539 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -52,17 +52,13 @@ void __pthread_do_unregister(struct __ptcb *cb) self->cancelbuf = self->cancelbuf->__next; } -static int start(void *p) +static void start(pthread_t self) { - struct pthread *self = p; if (self->unblock_cancel) __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8); pthread_exit(self->start(self->start_arg)); - return 0; } -int __uniclone(void *, int (*)(), void *); - #define ROUND(x) (((x)+PAGE_SIZE-1)&-PAGE_SIZE) /* pthread_key_create.c overrides this */ diff --git a/src/thread/synccall.c b/src/thread/synccall.c index 91ac5eb7..2cd25e4b 100644 --- a/src/thread/synccall.c +++ b/src/thread/synccall.c @@ -4,7 +4,7 @@ static struct chain { struct chain *next; sem_t sem, sem2; -} *head; +} *head, *cur; static void (*callback)(void *), *context; static int chainlen; @@ -47,11 +47,19 @@ static void handler(int sig, siginfo_t *si, void *ctx) errno = old_errno; } +void __synccall_wait() +{ + struct chain *ch = cur; + sem_post(&ch->sem2); + while (sem_wait(&ch->sem)); + sem_post(&ch->sem); +} + 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) { |