implement pthread_getattr_np

[musl] / src / thread / pthread_create.c

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 4c1deca..6163f50 100644 (file)
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -40,7 +40,7 @@ _Noreturn void pthread_exit(void *result)
                if (self->detached == 2)
                        __syscall(SYS_set_tid_address, 0);
                __syscall(SYS_rt_sigprocmask, SIG_BLOCK,
-                       SIGALL_SET, 0, __SYSCALL_SSLEN);
+                       SIGALL_SET, 0, _NSIG/8);
                __unmapself(self->map_base, self->map_size);
        }
 
@@ -69,11 +69,11 @@ static int start(void *p)
                        pthread_exit(0);
                }
                __syscall(SYS_rt_sigprocmask, SIG_SETMASK,
-                       self->sigmask, 0, __SYSCALL_SSLEN);
+                       self->sigmask, 0, _NSIG/8);
        }
        if (self->unblock_cancel)
                __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
-                       SIGPT_SET, 0, __SYSCALL_SSLEN);
+                       SIGPT_SET, 0, _NSIG/8);
        pthread_exit(self->start(self->start_arg));
        return 0;
 }
@@ -101,7 +101,7 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp
        int ret;
        size_t size, guard;
        struct pthread *self = pthread_self(), *new;
-       unsigned char *map = 0, *stack = 0, *tsd = 0;
+       unsigned char *map = 0, *stack = 0, *tsd = 0, *stack_limit;
        unsigned flags = 0x7d8f00;
        int do_sched = 0;
        pthread_attr_t attr = {0};
@@ -123,6 +123,7 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp
                size_t need = libc.tls_size + __pthread_tsd_size;
                size = attr._a_stacksize + DEFAULT_STACK_SIZE;
                stack = (void *)(attr._a_stackaddr & -16);
+               stack_limit = attr._a_stackaddr - size;
                /* Use application-provided stack for TLS only when
                 * it does not take more than ~12% or 2k of the
                 * application's stack space. */
@@ -142,22 +143,27 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp
        if (!tsd) {
                if (guard) {
                        map = mmap(0, size, PROT_NONE, MAP_PRIVATE|MAP_ANON, -1, 0);
-                       if (map == MAP_FAILED) return EAGAIN;
+                       if (map == MAP_FAILED) goto fail;
                        if (mprotect(map+guard, size-guard, PROT_READ|PROT_WRITE)) {
                                munmap(map, size);
-                               return EAGAIN;
+                               goto fail;
                        }
                } else {
                        map = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
-                       if (map == MAP_FAILED) return EAGAIN;
+                       if (map == MAP_FAILED) goto fail;
                }
                tsd = map + size - __pthread_tsd_size;
-               if (!stack) stack = tsd - libc.tls_size;
+               if (!stack) {
+                       stack = tsd - libc.tls_size;
+                       stack_limit = map + guard;
+               }
        }
 
        new = __copy_tls(tsd - libc.tls_size);
        new->map_base = map;
        new->map_size = size;
+       new->stack = stack;
+       new->stack_size = stack - stack_limit;
        new->pid = self->pid;
        new->errno_ptr = &new->errno_val;
        new->start = entry;
@@ -171,7 +177,7 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp
        if (attr._a_sched) {
                do_sched = new->startlock[0] = 1;
                __syscall(SYS_rt_sigprocmask, SIG_BLOCK,
-                       SIGALL_SET, self->sigmask, __SYSCALL_SSLEN);
+                       SIGALL_SET, self->sigmask, _NSIG/8);
        }
        new->unblock_cancel = self->cancel;
        new->canary = self->canary;
@@ -183,12 +189,12 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp
 
        if (do_sched) {
                __syscall(SYS_rt_sigprocmask, SIG_SETMASK,
-                       new->sigmask, 0, __SYSCALL_SSLEN);
+                       new->sigmask, 0, _NSIG/8);
        }
 
        if (ret < 0) {
                a_dec(&libc.threads_minus_1);
-               munmap(map, size);
+               if (map) munmap(map, size);
                return EAGAIN;
        }
 
@@ -202,4 +208,7 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attrp
 
        *res = new;
        return 0;
+fail:
+       __release_ptc();
+       return EAGAIN;
 }