pthread and synccall cleanup, new __synccall_wait op

[musl] / src / thread / pthread_create.c

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index a645f9f..bef2553 100644 (file)
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -1,18 +1,14 @@
 #include "pthread_impl.h"
+#include "stdio_impl.h"
 
 static void dummy_0()
 {
 }
-weak_alias(dummy_0, __rsyscall_lock);
-weak_alias(dummy_0, __rsyscall_unlock);
+weak_alias(dummy_0, __synccall_lock);
+weak_alias(dummy_0, __synccall_unlock);
 weak_alias(dummy_0, __pthread_tsd_run_dtors);
 
-#ifdef __pthread_unwind_next
-#undef __pthread_unwind_next
-#define __pthread_unwind_next __pthread_unwind_next_3
-#endif
-
-void __pthread_unwind_next(struct __ptcb *cb)
+void __pthread_do_unwind(struct __ptcb *cb)
 {
        pthread_t self = pthread_self();
        int n;
@@ -22,12 +18,14 @@ void __pthread_unwind_next(struct __ptcb *cb)
                longjmp((void *)cb->__next->__jb, 1);
        }
 
-       LOCK(&self->exitlock);
-
        __pthread_tsd_run_dtors();
 
+       __lock(&self->exitlock);
+
        /* Mark this thread dead before decrementing count */
+       __lock(&self->killlock);
        self->dead = 1;
+       a_store(&self->killlock, 0);
 
        do n = libc.threads_minus_1;
        while (n && a_cas(&libc.threads_minus_1, n, n-1)!=n);
@@ -41,23 +39,42 @@ void __pthread_unwind_next(struct __ptcb *cb)
        __syscall(SYS_exit, 0);
 }
 
-static int start(void *p)
+void __pthread_do_register(struct __ptcb *cb)
+{
+       struct pthread *self = pthread_self();
+       cb->__next = self->cancelbuf;
+       self->cancelbuf = cb;
+}
+
+void __pthread_do_unregister(struct __ptcb *cb)
+{
+       struct pthread *self = __pthread_self();
+       self->cancelbuf = self->cancelbuf->__next;
+}
+
+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 */
 static const size_t dummy = 0;
 weak_alias(dummy, __pthread_tsd_size);
 
+static FILE *const dummy_file = 0;
+weak_alias(dummy_file, __stdin_used);
+weak_alias(dummy_file, __stdout_used);
+weak_alias(dummy_file, __stderr_used);
+
+static void init_file_lock(FILE *f)
+{
+       if (f && f->lock<0) f->lock = 0;
+}
+
 int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(void *), void *arg)
 {
        int ret;
@@ -68,6 +85,11 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 
        if (!self) return ENOSYS;
        if (!libc.threaded) {
+               for (FILE *f=libc.ofl_head; f; f=f->next)
+                       init_file_lock(f);
+               init_file_lock(__stdin_used);
+               init_file_lock(__stdout_used);
+               init_file_lock(__stderr_used);
                __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
                libc.threaded = 1;
        }
@@ -97,12 +119,12 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
        new->tlsdesc[1] = (uintptr_t)new;
        stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15);
 
-       __rsyscall_lock();
+       __synccall_lock();
 
        a_inc(&libc.threads_minus_1);
        ret = __uniclone(stack, start, new);
 
-       __rsyscall_unlock();
+       __synccall_unlock();
 
        if (ret < 0) {
                a_dec(&libc.threads_minus_1);
@@ -118,5 +140,5 @@ void pthread_exit(void *result)
        struct pthread *self = pthread_self();
        struct __ptcb cb = { .__next = self->cancelbuf };
        self->result = result;
-       __pthread_unwind_next(&cb);
+       __pthread_do_unwind(&cb);
 }