X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_create.c;h=6f1bb0e8172b3c8045b4fa0867071c3118dd1e6c;hp=6fa484c72a38df8bc6d45fb06df7537443415a06;hb=fd80cfa00b34ec81b3049b98c66f6a45301ca6c4;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 6fa484c7..6f1bb0e8 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -1,20 +1,68 @@
 #include "pthread_impl.h"
 
-#define pthread_self __pthread_self
+static void dummy_1(pthread_t self)
+{
+}
+weak_alias(dummy_1, __pthread_tsd_run_dtors);
+
+#ifdef __pthread_unwind_next
+#undef __pthread_unwind_next
+#define __pthread_unwind_next __pthread_unwind_next_3
+#endif
+
+void __pthread_unwind_next(struct __ptcb *cb)
+{
+	pthread_t self;
+
+	if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
+
+	self = pthread_self();
+
+	LOCK(&self->exitlock);
+
+	__pthread_tsd_run_dtors(self);
+
+	/* 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) {
+		syscall(__NR_rt_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1},0,8);
+		__unmapself(self->map_base, self->map_size);
+	}
+
+	syscall(SYS_exit, 0);
+}
 
 static void docancel(struct pthread *self)
 {
 	struct __ptcb cb = { .__next = self->cancelbuf };
+	self->canceldisable = 1;
+	self->cancelasync = 0;
 	__pthread_unwind_next(&cb);
 }
 
 static void cancel_handler(int sig, siginfo_t *si, void *ctx)
 {
-	struct pthread *self = pthread_self();
-	self->cancel = 1;
-	if (self->canceldisable || (!self->cancelasync && !self->cancelpoint))
+	struct pthread *self = __pthread_self();
+	if (!self->cancel) {
+		if (si->si_code == SI_TIMER && libc.sigtimer)
+			libc.sigtimer(sig, si, ctx);
 		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;
+	if ((self->cancelpoint+=x)==1 && x>=0 && self->cancel)
+		docancel(self);
 }
 
 /* "rsyscall" is a mechanism by which a thread can synchronously force all
@@ -33,9 +81,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;
 
-	if (syscall6(rs.nr, rs.arg[0], rs.arg[1], rs.arg[2],
+	/* 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 (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);
@@ -50,7 +108,7 @@ static int rsyscall(int nr, long a, long b, long c, long d, long e, long f)
 {
 	int i, ret;
 	sigset_t set = { 0 };
-	struct pthread *self = pthread_self();
+	struct pthread *self = __pthread_self();
 	sigaddset(&set, SIGSYSCALL);
 
 	LOCK(&rs.lock);
@@ -84,24 +142,17 @@ 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;
 }
 
-static void cancelpt(int x)
-{
-	struct pthread *self = pthread_self();
-	if (self->canceldisable) return;
-	self->cancelpoint = x;
-	if (self->cancel) docancel(self);
-}
-
 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;
@@ -116,14 +167,17 @@ static void init_threads()
 static int start(void *p)
 {
 	struct pthread *self = p;
+	if (self->unblock_cancel) {
+		sigset_t set;
+		sigemptyset(&set);
+		sigaddset(&set, SIGCANCEL);
+		__libc_sigprocmask(SIG_UNBLOCK, &set, 0);
+	}
 	pthread_exit(self->start(self->start_arg));
 	return 0;
 }
 
-#undef pthread_self
-
-#define CLONE_MAGIC 0x7d0f00
-int __clone(int (*)(void *), void *, int, void *, pid_t *, void *, pid_t *);
+int __uniclone(void *, int (*)(), void *);
 
 #define ROUND(x) (((x)+PAGE_SIZE-1)&-PAGE_SIZE)
 
@@ -144,12 +198,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);
@@ -161,8 +215,10 @@ 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;
+	new->unblock_cancel = self->cancel;
+	new->result = PTHREAD_CANCELED;
 	memcpy(new->tlsdesc, self->tlsdesc, sizeof new->tlsdesc);
 	new->tlsdesc[1] = (uintptr_t)new;
 	stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15);
@@ -173,8 +229,7 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	while (rs.lock) __wait(&rs.lock, 0, 1, 1);
 
 	a_inc(&libc.threads_minus_1);
-	ret = __clone(start, stack, CLONE_MAGIC, new,
-		&new->tid, &new->tlsdesc, &new->tid);
+	ret = __uniclone(stack, start, new);
 
 	a_dec(&rs.blocks);
 	if (rs.lock) __wake(&rs.blocks, 1, 1);
@@ -182,8 +237,15 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	if (ret < 0) {
 		a_dec(&libc.threads_minus_1);
 		munmap(map, size);
-		return -ret;
+		return EAGAIN;
 	}
 	*res = new;
 	return 0;
 }
+
+void pthread_exit(void *result)
+{
+	struct pthread *self = pthread_self();
+	self->result = result;
+	docancel(self);
+}