mirror of
https://github.com/fluencelabs/musl
synced 2025-06-20 18:26:52 +00:00
fix breakage in cancellation due to signal functions overhaul
sigaddset was not accepting SIGCANCEL as a valid signal number.
This commit is contained in:
@ -31,6 +31,12 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
|
|||||||
return r;
|
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)
|
static void cancel_handler(int sig, siginfo_t *si, void *ctx)
|
||||||
{
|
{
|
||||||
pthread_t self = __pthread_self();
|
pthread_t self = __pthread_self();
|
||||||
@ -40,7 +46,7 @@ static void cancel_handler(int sig, siginfo_t *si, void *ctx)
|
|||||||
|
|
||||||
if (!self->cancel || self->canceldisable) return;
|
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 || sp == self->cp_sp && ip <= self->cp_ip) {
|
||||||
self->canceldisable = 1;
|
self->canceldisable = 1;
|
||||||
|
Reference in New Issue
Block a user