consistently use the LOCK an UNLOCK macros

[oweals/musl.git] / src / thread / pthread_create.c

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index e7df34a949d40758619325f8fc87b53484b1d2ec..34cd9936b1c037828daf48dfc4bd84895f822cd5 100644 (file)
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -37,10 +37,10 @@ _Noreturn void __pthread_exit(void *result)
 
        __pthread_tsd_run_dtors();
 
-       __lock(self->exitlock);
+       LOCK(self->exitlock);
 
        /* Mark this thread dead before decrementing count */
-       __lock(self->killlock);
+       LOCK(self->killlock);
        self->dead = 1;
 
        /* Block all signals before decrementing the live thread count.
@@ -54,7 +54,7 @@ _Noreturn void __pthread_exit(void *result)
         * been blocked. This precludes observation of the thread id
         * as a live thread (with application code running in it) after
         * the thread was reported dead by ESRCH being returned. */
-       __unlock(self->killlock);
+       UNLOCK(self->killlock);
 
        /* It's impossible to determine whether this is "the last thread"
         * until performing the atomic decrement, since multiple threads
@@ -79,7 +79,7 @@ _Noreturn void __pthread_exit(void *result)
                int priv = (m->_m_type & 128) ^ 128;
                self->robust_list.pending = rp;
                self->robust_list.head = *rp;
-               int cont = a_swap(&m->_m_lock, self->tid|0x40000000);
+               int cont = a_swap(&m->_m_lock, 0x40000000);
                self->robust_list.pending = 0;
                if (cont < 0 || waiters)
                        __wake(&m->_m_lock, 1, priv);
@@ -131,9 +131,14 @@ void __do_cleanup_pop(struct __ptcb *cb)
 static int start(void *p)
 {
        pthread_t self = p;
+       /* States for startlock:
+        * 0 = no need for start sync
+        * 1 = waiting for parent to do work
+        * 2 = failure in parent, child must abort
+        * 3 = success in parent, child must restore sigmask */
        if (self->startlock[0]) {
                __wait(self->startlock, 0, 1, 1);
-               if (self->startlock[0]) {
+               if (self->startlock[0] == 2) {
                        self->detached = 2;
                        pthread_exit(0);
                }
@@ -163,6 +168,8 @@ static void *dummy_tsd[1] = { 0 };
 weak_alias(dummy_tsd, __pthread_tsd_main);
 
 volatile int __block_new_threads = 0;
+size_t __default_stacksize = DEFAULT_STACK_SIZE;
+size_t __default_guardsize = DEFAULT_GUARD_SIZE;
 
 static FILE *volatile dummy_file = 0;
 weak_alias(dummy_file, __stdin_used);
@@ -186,7 +193,7 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att
                | CLONE_THREAD | CLONE_SYSVSEM | CLONE_SETTLS
                | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED;
        int do_sched = 0;
-       pthread_attr_t attr = {0};
+       pthread_attr_t attr = { 0 };
 
        if (!libc.can_do_threads) return ENOSYS;
        self = __pthread_self();
@@ -204,11 +211,16 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att
        if (attrp && !c11) attr = *attrp;
 
        __acquire_ptc();
+       if (!attrp || c11) {
+               attr._a_stacksize = __default_stacksize;
+               attr._a_guardsize = __default_guardsize;
+       }
+
        if (__block_new_threads) __wait(&__block_new_threads, 0, 1, 1);
 
        if (attr._a_stackaddr) {
                size_t need = libc.tls_size + __pthread_tsd_size;
-               size = attr._a_stacksize + DEFAULT_STACK_SIZE;
+               size = attr._a_stacksize;
                stack = (void *)(attr._a_stackaddr & -16);
                stack_limit = (void *)(attr._a_stackaddr - size);
                /* Use application-provided stack for TLS only when
@@ -223,8 +235,8 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att
                        guard = 0;
                }
        } else {
-               guard = ROUND(DEFAULT_GUARD_SIZE + attr._a_guardsize);
-               size = guard + ROUND(DEFAULT_STACK_SIZE + attr._a_stacksize
+               guard = ROUND(attr._a_guardsize);
+               size = guard + ROUND(attr._a_stacksize
                        + libc.tls_size +  __pthread_tsd_size);
        }
 
@@ -288,7 +300,7 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att
        if (do_sched) {
                ret = __syscall(SYS_sched_setscheduler, new->tid,
                        attr._a_policy, &attr._a_prio);
-               a_store(new->startlock, ret<0 ? 2 : 0);
+               a_store(new->startlock, ret<0 ? 2 : 3);
                __wake(new->startlock, 1, 1);
                if (ret < 0) return -ret;
        }