3 files changed, 21 insertions, 10 deletions

diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index 228f61f7..1439aace 100644
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -8,19 +8,21 @@ static void relock(void *m)
 int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct timespec *ts)
 {
 	int r, e=0;
-	CANCELPT(0);
+	CANCELPT_BEGIN;
+	CANCELPT_END;
 
 	pthread_cleanup_push(relock, m);
 	c->_c_block = 1;
 	if ((r=pthread_mutex_unlock(m))) return r;
 
-	CANCELPT(1);
+	CANCELPT_BEGIN;
 	e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, 0);
-	CANCELPT(0);
+	CANCELPT_END;
 
 	pthread_cleanup_pop(0);
 	if ((r=pthread_mutex_lock(m))) return r;
 
-	CANCELPT(0);
+	CANCELPT_BEGIN;
+	CANCELPT_END;
 	return e;
 }
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 17a47f6a..785a82b8 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -42,6 +42,12 @@ void __pthread_unwind_next(struct __ptcb *cb)
 static void docancel(struct pthread *self)
 {
 	struct __ptcb cb = { .__next = self->cancelbuf };
+	sigset_t set;
+	self->canceldisable = 1;
+	self->cancelasync = 0;
+	sigemptyset(&set);
+	sigaddset(&set, SIGCANCEL);
+	__libc_sigprocmask(SIG_UNBLOCK, &set, 0);
 	__pthread_unwind_next(&cb);
 }
 
@@ -50,17 +56,17 @@ static void cancel_handler(int sig, siginfo_t *si, void *ctx)
 	struct pthread *self = __pthread_self();
 	if (si->si_code > 0 || si->si_pid != self->pid) return;
 	self->cancel = 1;
-	if (self->canceldisable || (!self->cancelasync && !self->cancelpoint))
-		return;
-	docancel(self);
+	if (self->canceldisable) return;
+	if (self->cancelasync || (self->cancelpoint==1 && PC_AT_SYS(ctx)))
+		docancel(self);
 }
 
 static void cancelpt(int x)
 {
 	struct pthread *self = __pthread_self();
 	if (self->canceldisable) return;
-	self->cancelpoint = x;
-	if (self->cancel) docancel(self);
+	if ((self->cancelpoint+=x)==1 && x>=0 && self->cancel)
+		docancel(self);
 }
 
 /* "rsyscall" is a mechanism by which a thread can synchronously force all
diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index ad3bf075..11a01700 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -9,15 +9,18 @@ int sem_timedwait(sem_t *sem, const struct timespec *at)
 		if (a_fetch_add(sem->__val, -1) > 0) return 0;
 		val = a_fetch_add(sem->__val, 1)+1;
 		if (val==1) __wake(sem->__val, 1, 0);
-		CANCELPT_BEGIN;
 		if (at && at->tv_nsec >= 1000000000UL) {
 			errno = EINVAL;
 			return -1;
 		}
+		CANCELPT_BEGIN;
 		if (val <= 0 && __timedwait(sem->__val, val, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
 			errno = ETIMEDOUT;
+			CANCELPT_TRY;
+			CANCELPT_END;
 			return -1;
 		}
+		CANCELPT_TRY;
 		CANCELPT_END;
 	}
 }