X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_create.c;h=9f22b4cf1dab68a8bf8dc785935e830c1eeb52b8;hp=d829fa26950c30d841cd7f3a946c6feda997d09b;hb=ea343364a719add2cd8adf8a50c15bb5f9400dd8;hpb=5fcebcde6aeba6ae4a339790beba5331fbcd3b6e

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index d829fa26..9f22b4cf 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -1,5 +1,10 @@
 #include "pthread_impl.h"
 
+#ifdef __pthread_unwind_next
+#undef __pthread_unwind_next
+#define __pthread_unwind_next __pthread_unwind_next_3
+#endif
+
 void __pthread_unwind_next(struct __ptcb *cb)
 {
 	int i, j, not_finished;
@@ -32,16 +37,22 @@ void __pthread_unwind_next(struct __ptcb *cb)
 		exit(0);
 
 	if (self->detached && self->map_base) {
-		syscall4(__NR_rt_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1},0,8);
+		syscall(__NR_rt_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1},0,8);
 		__unmapself(self->map_base, self->map_size);
 	}
 
-	__syscall_exit(0);
+	syscall(SYS_exit, 0);
 }
 
 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 +61,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
@@ -91,7 +102,7 @@ static void rsyscall_handler(int sig, siginfo_t *si, void *ctx)
 		return;
 	}
 
-	if (syscall6(rs.nr, rs.arg[0], rs.arg[1], rs.arg[2],
+	if (syscall(rs.nr, rs.arg[0], rs.arg[1], rs.arg[2],
 		rs.arg[3], rs.arg[4], rs.arg[5]) < 0 && !rs.err) rs.err=errno;
 
 	a_inc(&rs.cnt);
@@ -140,7 +151,7 @@ static int rsyscall(int nr, long a, long b, long c, long d, long e, long f)
 	while((i=rs.cnt)) __wait(&rs.cnt, 0, i, 1);
 
 	if (rs.err) errno = rs.err, ret = -1;
-	else ret = syscall6(nr, a, b, c, d, e, f);
+	else ret = syscall(nr, a, b, c, d, e, f);
 
 	UNLOCK(&rs.lock);
 	return ret;
@@ -150,6 +161,7 @@ static void init_threads()
 {
 	struct sigaction sa = { .sa_flags = SA_SIGINFO | SA_RESTART };
 	libc.lock = __lock;
+	libc.lockfile = __lockfile;
 	libc.cancelpt = cancelpt;
 	libc.rsyscall = rsyscall;
 	sa.sa_sigaction = cancel_handler;
@@ -194,7 +206,7 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	size += __pthread_tsd_size;
 	map = mmap(0, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0);
 	if (!map) return EAGAIN;
-	mprotect(map, guard, PROT_NONE);
+	if (guard) mprotect(map, guard, PROT_NONE);
 
 	tsd = map + size - __pthread_tsd_size;
 	new = (void *)(tsd - sizeof *new - PAGE_SIZE%sizeof *new);