void __cancel()
{
pthread_t self = __pthread_self();
+ self->cp_sp = 0;
self->canceldisable = 1;
self->cancelasync = 0;
pthread_exit(PTHREAD_CANCELED);
uintptr_t old_sp, old_ip;
long r;
- if (!libc.lock || (self = __pthread_self())->canceldisable)
+ if (!libc.threaded || (self = __pthread_self())->canceldisable)
return __syscall(nr, u, v, w, x, y, z);
old_sp = self->cp_sp;
self->cp_sp = 0;
self->cp_ip = 0;
r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z);
- self->cp_sp = old_sp;
self->cp_ip = old_ip;
- if (r == -EINTR && self->cancel) __cancel();
+ self->cp_sp = old_sp;
+ if (r == -EINTR && self->cancel && !self->canceldisable) __cancel();
return r;
}
+static void _sigaddset(sigset_t *set, int sig)
+{
+ unsigned s = sig-1;
+ set->__bits[s/8/sizeof *set->__bits] |= 1UL<<(s&8*sizeof *set->__bits-1);
+}
+
static void cancel_handler(int sig, siginfo_t *si, void *ctx)
{
pthread_t self = __pthread_self();
if (!self->cancel || self->canceldisable) return;
- sigaddset(&uc->uc_sigmask, SIGCANCEL);
+ _sigaddset(&uc->uc_sigmask, SIGCANCEL);
if (self->cancelasync || sp == self->cp_sp && ip <= self->cp_ip) {
self->canceldisable = 1;
int pthread_cancel(pthread_t t)
{
- static pthread_once_t once;
- pthread_once(&once, init_cancellation);
+ static int init;
+ if (!init) {
+ init_cancellation();
+ init = 1;
+ }
a_store(&t->cancel, 1);
return pthread_kill(t, SIGCANCEL);
}