projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bugs in cancellable syscall asm
[musl]
/
src
/
thread
/
cancel_impl.c
diff --git
a/src/thread/cancel_impl.c
b/src/thread/cancel_impl.c
index
28dc84d
..
2d2bb57
100644
(file)
--- a/
src/thread/cancel_impl.c
+++ b/
src/thread/cancel_impl.c
@@
-3,6
+3,7
@@
void __cancel()
{
pthread_t self = __pthread_self();
void __cancel()
{
pthread_t self = __pthread_self();
+ self->cp_sp = 0;
self->canceldisable = 1;
self->cancelasync = 0;
pthread_exit(PTHREAD_CANCELED);
self->canceldisable = 1;
self->cancelasync = 0;
pthread_exit(PTHREAD_CANCELED);
@@
-24,8
+25,8
@@
long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
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 = 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;
self->cp_ip = old_ip;
+ self->cp_sp = old_sp;
if (r == -EINTR && self->cancel) __cancel();
return r;
}
if (r == -EINTR && self->cancel) __cancel();
return r;
}
@@
-71,8
+72,11
@@
static void init_cancellation()
int pthread_cancel(pthread_t t)
{
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);
}
a_store(&t->cancel, 1);
return pthread_kill(t, SIGCANCEL);
}