X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_create.c;h=f53fc1baf0a5e5faf35f51f025e9a50fad4c4f24;hp=ae2f9e4e9b1cb6583e1820b50d150c4bab5de6dc;hb=8431d7972fd9be0fdcaff8516316d748e81724bb;hpb=92f8396b0c8e4f146563b87f46137484cfb36e31

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index ae2f9e4e..f53fc1ba 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -8,7 +8,7 @@ weak_alias(dummy_0, __synccall_lock);
 weak_alias(dummy_0, __synccall_unlock);
 weak_alias(dummy_0, __pthread_tsd_run_dtors);
 
-void pthread_exit(void *result)
+_Noreturn void pthread_exit(void *result)
 {
 	pthread_t self = pthread_self();
 	int n;
@@ -24,12 +24,12 @@ void pthread_exit(void *result)
 
 	__pthread_tsd_run_dtors();
 
-	__lock(&self->exitlock);
+	__lock(self->exitlock);
 
 	/* Mark this thread dead before decrementing count */
-	__lock(&self->killlock);
+	__lock(self->killlock);
 	self->dead = 1;
-	a_store(&self->killlock, 0);
+	__unlock(self->killlock);
 
 	do n = libc.threads_minus_1;
 	while (n && a_cas(&libc.threads_minus_1, n, n-1)!=n);
@@ -38,11 +38,12 @@ void pthread_exit(void *result)
 	if (self->detached && self->map_base) {
 		if (self->detached == 2)
 			__syscall(SYS_set_tid_address, 0);
-		__syscall(SYS_rt_sigprocmask, SIG_BLOCK, (uint64_t[]){-1},0,8);
+		__syscall(SYS_rt_sigprocmask, SIG_BLOCK,
+			SIGALL_SET, 0, __SYSCALL_SSLEN);
 		__unmapself(self->map_base, self->map_size);
 	}
 
-	__syscall(SYS_exit, 0);
+	for (;;) __syscall(SYS_exit, 0);
 }
 
 void __do_cleanup_push(struct __ptcb *cb)
@@ -61,7 +62,8 @@ static int start(void *p)
 {
 	pthread_t self = p;
 	if (self->unblock_cancel)
-		__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
+		__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+			SIGPT_SET, 0, __SYSCALL_SSLEN);
 	pthread_exit(self->start(self->start_arg));
 	return 0;
 }
@@ -82,7 +84,9 @@ static void init_file_lock(FILE *f)
 	if (f && f->lock<0) f->lock = 0;
 }
 
-int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(void *), void *arg)
+void *__copy_tls(unsigned char *, size_t);
+
+int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attr, void *(*entry)(void *), void *restrict arg)
 {
 	int ret;
 	size_t size = DEFAULT_STACK_SIZE + DEFAULT_GUARD_SIZE;
@@ -90,6 +94,8 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	struct pthread *self = pthread_self(), *new;
 	unsigned char *map, *stack, *tsd;
 	unsigned flags = 0x7d8f00;
+	size_t tls_cnt = libc.tls_cnt;
+	size_t tls_size = libc.tls_size;
 
 	if (!self) return ENOSYS;
 	if (!libc.threaded) {
@@ -107,15 +113,24 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	} else {
 		if (attr) {
 			guard = ROUND(attr->_a_guardsize + DEFAULT_GUARD_SIZE);
-			size = guard + ROUND(attr->_a_stacksize + DEFAULT_STACK_SIZE);
+			size = guard + ROUND(attr->_a_stacksize
+				+ DEFAULT_STACK_SIZE + tls_size);
 		}
 		size += __pthread_tsd_size;
-		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);
+		if (guard) {
+			map = mmap(0, size, PROT_NONE, MAP_PRIVATE|MAP_ANON, -1, 0);
+			if (map == MAP_FAILED) return EAGAIN;
+			if (mprotect(map+guard, size-guard, PROT_READ|PROT_WRITE)) {
+				munmap(map, size);
+				return EAGAIN;
+			}
+		} else {
+			map = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
+			if (map == MAP_FAILED) return EAGAIN;
+		}
 		tsd = map + size - __pthread_tsd_size;
 	}
-	new = (void *)(tsd - sizeof *new - PAGE_SIZE%sizeof *new);
+	new = __copy_tls(tsd - tls_size, tls_cnt);
 	new->map_base = map;
 	new->map_size = size;
 	new->pid = self->pid;