projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add linux setfs[ug]id syscall wrappers
[musl]
/
src
/
thread
/
cancel_impl.c
diff --git
a/src/thread/cancel_impl.c
b/src/thread/cancel_impl.c
index
1f4ff90
..
7652a7c
100644
(file)
--- a/
src/thread/cancel_impl.c
+++ b/
src/thread/cancel_impl.c
@@
-17,7
+17,7
@@
long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
uintptr_t old_sp, old_ip;
long r;
uintptr_t old_sp, old_ip;
long r;
- if (!libc.
threade
d || (self = __pthread_self())->canceldisable)
+ if (!libc.
main_threa
d || (self = __pthread_self())->canceldisable)
return __syscall(nr, u, v, w, x, y, z);
old_sp = self->cp_sp;
return __syscall(nr, u, v, w, x, y, z);
old_sp = self->cp_sp;
@@
-27,10
+27,17
@@
long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z);
self->cp_ip = old_ip;
self->cp_sp = old_sp;
r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z);
self->cp_ip = old_ip;
self->cp_sp = old_sp;
- if (r == -EINTR && self->cancel) __cancel();
+ if (r==-EINTR && nr!=SYS_close && self->cancel && !self->canceldisable)
+ __cancel();
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)
{
pthread_t self = __pthread_self();
static void cancel_handler(int sig, siginfo_t *si, void *ctx)
{
pthread_t self = __pthread_self();
@@
-40,7
+47,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) {
self->canceldisable = 1;
if (self->cancelasync || sp == self->cp_sp && ip <= self->cp_ip) {
self->canceldisable = 1;
@@
-52,9
+59,9
@@
static void cancel_handler(int sig, siginfo_t *si, void *ctx)
__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();
}
if (self->cancel && !self->canceldisable)
__cancel();
}
@@
-67,7
+74,6
@@
static void init_cancellation()
};
sigfillset(&sa.sa_mask);
__libc_sigaction(SIGCANCEL, &sa, 0);
};
sigfillset(&sa.sa_mask);
__libc_sigaction(SIGCANCEL, &sa, 0);
- libc.testcancel = testcancel;
}
int pthread_cancel(pthread_t t)
}
int pthread_cancel(pthread_t t)