X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_create.c;h=5b34e7e8bab6c2ed1d10f6a5857e3fcd91254572;hp=bef25539cbb362474ce44b2b5e16efb25bbf3b68;hb=1e597a3e9bbdbe82d2ffd3963019d3a3edeed859;hpb=407d933052c310ebc5541dae2ecd8c4bd8f55fb9

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index bef25539..5b34e7e8 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -8,14 +8,18 @@ weak_alias(dummy_0, __synccall_lock);
 weak_alias(dummy_0, __synccall_unlock);
 weak_alias(dummy_0, __pthread_tsd_run_dtors);
 
-void __pthread_do_unwind(struct __ptcb *cb)
+void pthread_exit(void *result)
 {
 	pthread_t self = pthread_self();
 	int n;
 
-	if (cb->__next) {
-		self->cancelbuf = cb->__next->__next;
-		longjmp((void *)cb->__next->__jb, 1);
+	self->result = result;
+
+	while (self->cancelbuf) {
+		void (*f)(void *) = self->cancelbuf->__f;
+		void *x = self->cancelbuf->__x;
+		self->cancelbuf = self->cancelbuf->__next;
+		f(x);
 	}
 
 	__pthread_tsd_run_dtors();
@@ -39,24 +43,25 @@ void __pthread_do_unwind(struct __ptcb *cb)
 	__syscall(SYS_exit, 0);
 }
 
-void __pthread_do_register(struct __ptcb *cb)
+void __do_cleanup_push(struct __ptcb *cb)
 {
 	struct pthread *self = pthread_self();
 	cb->__next = self->cancelbuf;
 	self->cancelbuf = cb;
 }
 
-void __pthread_do_unregister(struct __ptcb *cb)
+void __do_cleanup_pop(struct __ptcb *cb)
 {
-	struct pthread *self = __pthread_self();
-	self->cancelbuf = self->cancelbuf->__next;
+	__pthread_self()->cancelbuf = cb->__next;
 }
 
-static void start(pthread_t self)
+static int start(void *p)
 {
+	pthread_t self = p;
 	if (self->unblock_cancel)
 		__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
 	pthread_exit(self->start(self->start_arg));
+	return 0;
 }
 
 #define ROUND(x) (((x)+PAGE_SIZE-1)&-PAGE_SIZE)
@@ -90,7 +95,6 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 		init_file_lock(__stdin_used);
 		init_file_lock(__stdout_used);
 		init_file_lock(__stderr_used);
-		__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
 		libc.threaded = 1;
 	}
 
@@ -99,8 +103,8 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 		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;
+	map = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
+	if (map == MAP_FAILED) return EAGAIN;
 	if (guard) mprotect(map, guard, PROT_NONE);
 
 	tsd = map + size - __pthread_tsd_size;
@@ -115,14 +119,13 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	new->tsd = (void *)tsd;
 	if (attr) new->detached = attr->_a_detach;
 	new->unblock_cancel = self->cancel;
-	memcpy(new->tlsdesc, self->tlsdesc, sizeof new->tlsdesc);
-	new->tlsdesc[1] = (uintptr_t)new;
-	stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15);
+	new->canary = self->canary ^ (uintptr_t)&new;
+	stack = (void *)new;
 
 	__synccall_lock();
 
 	a_inc(&libc.threads_minus_1);
-	ret = __uniclone(stack, start, new);
+	ret = __clone(start, stack, 0x7d8f00, new, &new->tid, new, &new->tid);
 
 	__synccall_unlock();
 
@@ -134,11 +137,3 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	*res = new;
 	return 0;
 }
-
-void pthread_exit(void *result)
-{
-	struct pthread *self = pthread_self();
-	struct __ptcb cb = { .__next = self->cancelbuf };
-	self->result = result;
-	__pthread_do_unwind(&cb);
-}