X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_create.c;h=fccfa1914bc8febfb161e61fc577a34b79cda37b;hp=af6ccf0760769ea6709b447227c705e07506a71f;hb=d00ff2950eacc375d57e44d65c7697f636c67625;hpb=0b2006c8fea021b7fa1fd267bf270cb8c279f230

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index af6ccf07..fccfa191 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -10,9 +10,6 @@ void __pthread_unwind_next(struct __ptcb *cb)
 	self = pthread_self();
 	if (self->cancel) self->result = PTHREAD_CANCELLED;
 
-	if (!a_fetch_add(&libc.threads_minus_1, -1))
-		exit(0);
-
 	LOCK(&self->exitlock);
 
 	not_finished = self->tsd_used;
@@ -28,8 +25,16 @@ void __pthread_unwind_next(struct __ptcb *cb)
 		}
 	}
 
-	if (self->detached && self->map_base)
+	/* Mark this thread dead before decrementing count */
+	self->dead = 1;
+
+	if (!a_fetch_add(&libc.threads_minus_1, -1))
+		exit(0);
+
+	if (self->detached && self->map_base) {
+		syscall4(__NR_rt_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1},0,8);
 		__unmapself(self->map_base, self->map_size);
+	}
 
 	__syscall_exit(0);
 }
@@ -43,6 +48,7 @@ static void docancel(struct pthread *self)
 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;
@@ -73,9 +79,19 @@ static struct {
 
 static void rsyscall_handler(int sig, siginfo_t *si, void *ctx)
 {
-	if (rs.cnt == libc.threads_minus_1) return;
+	struct pthread *self = __pthread_self();
+
+	if (si->si_code > 0 || si->si_pid != self->pid ||
+		rs.cnt == libc.threads_minus_1) return;
+
+	/* Threads which have already decremented themselves from the
+	 * thread count must not increment rs.cnt or otherwise act. */
+	if (self->dead) {
+		__wait(&rs.hold, 0, 1, 1);
+		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);
@@ -124,7 +140,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;
@@ -134,6 +150,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;
@@ -173,12 +190,12 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	if (!init && ++init) init_threads();
 
 	if (!attr) attr = &default_attr;
-	guard = ROUND(attr->__guardsize + DEFAULT_GUARD_SIZE);
-	size = guard + ROUND(attr->__stacksize + DEFAULT_STACK_SIZE);
+	guard = ROUND(attr->_a_guardsize + DEFAULT_GUARD_SIZE);
+	size = guard + ROUND(attr->_a_stacksize + DEFAULT_STACK_SIZE);
 	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);
@@ -190,7 +207,7 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	new->start_arg = arg;
 	new->self = new;
 	new->tsd = (void *)tsd;
-	new->detached = attr->__detach;
+	new->detached = attr->_a_detach;
 	new->attr = *attr;
 	memcpy(new->tlsdesc, self->tlsdesc, sizeof new->tlsdesc);
 	new->tlsdesc[1] = (uintptr_t)new;