omit pthread tsd dtor code if tsd is not used

[musl] / src / thread / pthread_create.c

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 7cd57d8..6f1bb0e 100644 (file)
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -1,5 +1,10 @@
 #include "pthread_impl.h"
 
+static void dummy_1(pthread_t self)
+{
+}
+weak_alias(dummy_1, __pthread_tsd_run_dtors);
+
 #ifdef __pthread_unwind_next
 #undef __pthread_unwind_next
 #define __pthread_unwind_next __pthread_unwind_next_3
@@ -7,28 +12,15 @@
 
 void __pthread_unwind_next(struct __ptcb *cb)
 {
-       int i, j, not_finished;
        pthread_t self;
 
        if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
 
        self = pthread_self();
-       if (self->cancel) self->result = PTHREAD_CANCELED;
 
        LOCK(&self->exitlock);
 
-       not_finished = self->tsd_used;
-       for (j=0; not_finished && j<PTHREAD_DESTRUCTOR_ITERATIONS; j++) {
-               not_finished = 0;
-               for (i=0; i<PTHREAD_KEYS_MAX; i++) {
-                       if (self->tsd[i] && libc.tsd_keys[i]) {
-                               void *tmp = self->tsd[i];
-                               self->tsd[i] = 0;
-                               libc.tsd_keys[i](tmp);
-                               not_finished = 1;
-                       }
-               }
-       }
+       __pthread_tsd_run_dtors(self);
 
        /* Mark this thread dead before decrementing count */
        self->dead = 1;
@@ -226,6 +218,7 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
        new->detached = attr->_a_detach;
        new->attr = *attr;
        new->unblock_cancel = self->cancel;
+       new->result = PTHREAD_CANCELED;
        memcpy(new->tlsdesc, self->tlsdesc, sizeof new->tlsdesc);
        new->tlsdesc[1] = (uintptr_t)new;
        stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15);