long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
{
pthread_t self;
- uintptr_t old_sp, old_ip;
long r;
- if (!libc.lock || (self = __pthread_self())->canceldisable)
+ if (!libc.main_thread || (self = __pthread_self())->canceldisable)
return __syscall(nr, u, v, w, x, y, z);
- old_sp = self->cp_sp;
- old_ip = self->cp_ip;
- 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();
+ r = __syscall_cp_asm(&self->cancel, nr, u, v, w, x, y, z);
+ if (r==-EINTR && nr!=SYS_close && 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();
ucontext_t *uc = ctx;
- uintptr_t sp = ((uintptr_t *)&uc->uc_mcontext)[CANCEL_REG_SP];
- uintptr_t ip = ((uintptr_t *)&uc->uc_mcontext)[CANCEL_REG_IP];
+ const char *ip = ((char **)&uc->uc_mcontext)[CANCEL_REG_IP];
+ extern const char __cp_begin[1], __cp_end[1];
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) {
+ if (self->cancelasync || ip >= __cp_begin && ip < __cp_end) {
self->canceldisable = 1;
pthread_sigmask(SIG_SETMASK, &uc->uc_sigmask, 0);
__cancel();
}
- if (self->cp_sp)
- __syscall(SYS_tgkill, self->pid, self->tid, SIGCANCEL);
+ __syscall(SYS_tgkill, self->pid, self->tid, SIGCANCEL);
}
-static void testcancel()
+void __testcancel()
{
- pthread_t self = __pthread_self();
+ pthread_t self = pthread_self();
if (self->cancel && !self->canceldisable)
__cancel();
}
};
sigfillset(&sa.sa_mask);
__libc_sigaction(SIGCANCEL, &sa, 0);
- libc.testcancel = testcancel;
}
int pthread_cancel(pthread_t t)