X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_cancel.c;h=1b71aa423399220f70a0a35066af8b04d8d0339a;hb=102f6a01e249ce4495f1119ae6d963a2a4a53ce5;hp=66e0817ce79cb833198f3080b92e327780e7d41d;hpb=f409338a9e808a09001669377c608fd2803d808d;p=musl

diff --git a/src/thread/pthread_cancel.c b/src/thread/pthread_cancel.c
index 66e0817c..1b71aa42 100644
--- a/src/thread/pthread_cancel.c
+++ b/src/thread/pthread_cancel.c
@@ -2,9 +2,13 @@
 #include "syscall.h"
 #include "libc.h"
 
-void __cancel()
+long __cancel()
 {
-	pthread_exit(PTHREAD_CANCELED);
+	pthread_t self = __pthread_self();
+	if (self->canceldisable == PTHREAD_CANCEL_ENABLE || self->cancelasync)
+		pthread_exit(PTHREAD_CANCELED);
+	self->canceldisable = PTHREAD_CANCEL_DISABLE;
+	return -ECANCELED;
 }
 
 /* If __syscall_cp_asm has adjusted the stack pointer, it must provide a
@@ -23,13 +27,16 @@ long __syscall_cp_c(syscall_arg_t nr,
 {
 	pthread_t self;
 	long r;
+	int st;
 
-	if (!libc.has_thread_pointer || (self = __pthread_self())->canceldisable)
+	if (!libc.has_thread_pointer || (st=(self=__pthread_self())->canceldisable)
+	    && (st==PTHREAD_CANCEL_DISABLE || nr==SYS_close))
 		return __syscall(nr, u, v, w, x, y, z);
 
 	r = __syscall_cp_asm(&self->cancel, nr, u, v, w, x, y, z);
-	if (r==-EINTR && nr!=SYS_close && self->cancel && !self->canceldisable)
-		__cancel();
+	if (r==-EINTR && nr!=SYS_close && self->cancel &&
+	    self->canceldisable != PTHREAD_CANCEL_DISABLE)
+		r = __cancel();
 	return r;
 }
 
@@ -47,14 +54,13 @@ static void cancel_handler(int sig, siginfo_t *si, void *ctx)
 	extern const char __cp_begin[1], __cp_end[1];
 
 	a_barrier();
-	if (!self->cancel || self->canceldisable) return;
+	if (!self->cancel || self->canceldisable == PTHREAD_CANCEL_DISABLE) return;
 
 	_sigaddset(&uc->uc_sigmask, SIGCANCEL);
 
 	if (self->cancelasync || ip >= __cp_begin && ip < __cp_end) {
-		self->canceldisable = 1;
-		pthread_sigmask(SIG_SETMASK, &uc->uc_sigmask, 0);
-		__cancel();
+		((char **)&uc->uc_mcontext)[CANCEL_REG_IP] = (char *)__cp_cancel;
+		return;
 	}
 
 	__syscall(SYS_tkill, self->tid, SIGCANCEL);