#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;
static void docancel(struct pthread *self)
{
struct __ptcb cb = { .__next = self->cancelbuf };
+ self->canceldisable = 1;
+ self->cancelasync = 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->canceldisable || (!self->cancelasync && !self->cancelpoint))
+ if (!self->cancel) {
+ if (si->si_code == SI_TIMER && libc.sigtimer)
+ libc.sigtimer(sig, si, ctx);
return;
- docancel(self);
+ }
+ if (self->canceldisable) return;
+ if (self->cancelasync || (self->cancelpoint==1 && PC_AT_SYS(ctx)))
+ docancel(self);
}
static void cancelpt(int x)
{
struct pthread *self = __pthread_self();
if (self->canceldisable) return;
- self->cancelpoint = x;
- if (self->cancel) docancel(self);
+ if ((self->cancelpoint+=x)==1 && x>=0 && self->cancel)
+ docancel(self);
}
/* "rsyscall" is a mechanism by which a thread can synchronously force all
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;
}
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);