omit pthread tsd dtor code if tsd is not used
[musl] / src / thread / pthread_create.c
index 785a82b..6f1bb0e 100644 (file)
@@ -1,29 +1,26 @@
 #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
+#endif
+
 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_CANCELLED;
 
        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;
@@ -42,20 +39,19 @@ void __pthread_unwind_next(struct __ptcb *cb)
 static void docancel(struct pthread *self)
 {
        struct __ptcb cb = { .__next = self->cancelbuf };
-       sigset_t set;
        self->canceldisable = 1;
        self->cancelasync = 0;
-       sigemptyset(&set);
-       sigaddset(&set, SIGCANCEL);
-       __libc_sigprocmask(SIG_UNBLOCK, &set, 0);
        __pthread_unwind_next(&cb);
 }
 
 static void cancel_handler(int sig, siginfo_t *si, void *ctx)
 {
        struct pthread *self = __pthread_self();
-       if (si->si_code > 0 || si->si_pid != self->pid) return;
-       self->cancel = 1;
+       if (!self->cancel) {
+               if (si->si_code == SI_TIMER && libc.sigtimer)
+                       libc.sigtimer(sig, si, ctx);
+               return;
+       }
        if (self->canceldisable) return;
        if (self->cancelasync || (self->cancelpoint==1 && PC_AT_SYS(ctx)))
                docancel(self);
@@ -171,6 +167,12 @@ static void init_threads()
 static int start(void *p)
 {
        struct pthread *self = p;
+       if (self->unblock_cancel) {
+               sigset_t set;
+               sigemptyset(&set);
+               sigaddset(&set, SIGCANCEL);
+               __libc_sigprocmask(SIG_UNBLOCK, &set, 0);
+       }
        pthread_exit(self->start(self->start_arg));
        return 0;
 }
@@ -215,6 +217,8 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
        new->tsd = (void *)tsd;
        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);