X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fthread%2Fpthread_create.c;h=a645f9fe3d3b1ab007210d971beb9cb487728e1c;hb=9a59faab3c0c46d2e96245e11fc71351caba1a2e;hp=8e3a4a26e94484825a0978dba22ff76b93e8b4a3;hpb=9080cc153cc2b09881c3245becbd68534db18d7c;p=musl

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 8e3a4a26..a645f9fe 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -5,11 +5,7 @@ static void dummy_0()
 }
 weak_alias(dummy_0, __rsyscall_lock);
 weak_alias(dummy_0, __rsyscall_unlock);
-
-static void dummy_1(pthread_t self)
-{
-}
-weak_alias(dummy_1, __pthread_tsd_run_dtors);
+weak_alias(dummy_0, __pthread_tsd_run_dtors);
 
 #ifdef __pthread_unwind_next
 #undef __pthread_unwind_next
@@ -18,16 +14,17 @@ weak_alias(dummy_1, __pthread_tsd_run_dtors);
 
 void __pthread_unwind_next(struct __ptcb *cb)
 {
-	pthread_t self;
+	pthread_t self = pthread_self();
 	int n;
 
-	if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
-
-	self = pthread_self();
+	if (cb->__next) {
+		self->cancelbuf = cb->__next->__next;
+		longjmp((void *)cb->__next->__jb, 1);
+	}
 
 	LOCK(&self->exitlock);
 
-	__pthread_tsd_run_dtors(self);
+	__pthread_tsd_run_dtors();
 
 	/* Mark this thread dead before decrementing count */
 	self->dead = 1;
@@ -37,7 +34,7 @@ void __pthread_unwind_next(struct __ptcb *cb)
 	if (!n) exit(0);
 
 	if (self->detached && self->map_base) {
-		__syscall(SYS_rt_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1},0,8);
+		__syscall(SYS_rt_sigprocmask, SIG_BLOCK, (uint64_t[]){-1},0,8);
 		__unmapself(self->map_base, self->map_size);
 	}
 
@@ -47,12 +44,8 @@ void __pthread_unwind_next(struct __ptcb *cb)
 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);
-	}
+	if (self->unblock_cancel)
+		__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
 	pthread_exit(self->start(self->start_arg));
 	return 0;
 }
@@ -68,24 +61,21 @@ weak_alias(dummy, __pthread_tsd_size);
 int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(void *), void *arg)
 {
 	int ret;
-	size_t size, guard;
+	size_t size = DEFAULT_STACK_SIZE + DEFAULT_GUARD_SIZE;
+	size_t guard = DEFAULT_GUARD_SIZE;
 	struct pthread *self = pthread_self(), *new;
 	unsigned char *map, *stack, *tsd;
-	const pthread_attr_t default_attr = { 0 };
 
 	if (!self) return ENOSYS;
 	if (!libc.threaded) {
-		sigset_t set;
-		sigemptyset(&set);
-		sigaddset(&set, SIGSYSCALL);
-		sigaddset(&set, SIGCANCEL);
-		__libc_sigprocmask(SIG_UNBLOCK, &set, 0);
+		__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
 		libc.threaded = 1;
 	}
 
-	if (!attr) attr = &default_attr;
-	guard = ROUND(attr->_a_guardsize + DEFAULT_GUARD_SIZE);
-	size = guard + ROUND(attr->_a_stacksize + DEFAULT_STACK_SIZE);
+	if (attr) {
+		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;
@@ -101,10 +91,8 @@ 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->_a_detach;
-	new->attr = *attr;
+	if (attr) new->detached = attr->_a_detach;
 	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);
@@ -130,7 +118,5 @@ void pthread_exit(void *result)
 	struct pthread *self = pthread_self();
 	struct __ptcb cb = { .__next = self->cancelbuf };
 	self->result = result;
-	self->canceldisable = 1;
-	self->cancelasync = 0;
 	__pthread_unwind_next(&cb);
 }