exit(0);
}
- if (self->locale != &libc.global_locale) {
- a_dec(&libc.uselocale_cnt);
- if (self->locale->ctype_utf8)
- a_dec(&libc.bytelocale_cnt_minus_1);
- }
-
/* Process robust list in userspace to handle non-pshared mutexes
* and the detached thread case where the robust list head will
* be invalid when the kernel would process it. */
int priv = (m->_m_type & 128) ^ 128;
self->robust_list.pending = rp;
self->robust_list.head = *rp;
- int cont = a_swap(&m->_m_lock, self->tid|0x40000000);
+ int cont = a_swap(&m->_m_lock, 0x40000000);
self->robust_list.pending = 0;
if (cont < 0 || waiters)
__wake(&m->_m_lock, 1, priv);
static int start(void *p)
{
pthread_t self = p;
+ /* States for startlock:
+ * 0 = no need for start sync
+ * 1 = waiting for parent to do work
+ * 2 = failure in parent, child must abort
+ * 3 = success in parent, child must restore sigmask */
if (self->startlock[0]) {
__wait(self->startlock, 0, 1, 1);
- if (self->startlock[0]) {
+ if (self->startlock[0] == 2) {
self->detached = 2;
pthread_exit(0);
}
weak_alias(dummy_tsd, __pthread_tsd_main);
volatile int __block_new_threads = 0;
+size_t __default_stacksize = DEFAULT_STACK_SIZE;
+size_t __default_guardsize = DEFAULT_GUARD_SIZE;
static FILE *volatile dummy_file = 0;
weak_alias(dummy_file, __stdin_used);
| CLONE_THREAD | CLONE_SYSVSEM | CLONE_SETTLS
| CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED;
int do_sched = 0;
- pthread_attr_t attr = {0};
+ pthread_attr_t attr = { 0 };
if (!libc.can_do_threads) return ENOSYS;
self = __pthread_self();
if (!libc.threaded) {
- for (FILE *f=libc.ofl_head; f; f=f->next)
+ for (FILE *f=*__ofl_lock(); f; f=f->next)
init_file_lock(f);
+ __ofl_unlock();
init_file_lock(__stdin_used);
init_file_lock(__stdout_used);
init_file_lock(__stderr_used);
if (attrp && !c11) attr = *attrp;
__acquire_ptc();
+ if (!attrp || c11) {
+ attr._a_stacksize = __default_stacksize;
+ attr._a_guardsize = __default_guardsize;
+ }
+
if (__block_new_threads) __wait(&__block_new_threads, 0, 1, 1);
if (attr._a_stackaddr) {
size_t need = libc.tls_size + __pthread_tsd_size;
- size = attr._a_stacksize + DEFAULT_STACK_SIZE;
+ size = attr._a_stacksize;
stack = (void *)(attr._a_stackaddr & -16);
stack_limit = (void *)(attr._a_stackaddr - size);
/* Use application-provided stack for TLS only when
guard = 0;
}
} else {
- guard = ROUND(DEFAULT_GUARD_SIZE + attr._a_guardsize);
- size = guard + ROUND(DEFAULT_STACK_SIZE + attr._a_stacksize
+ guard = ROUND(attr._a_guardsize);
+ size = guard + ROUND(attr._a_stacksize
+ libc.tls_size + __pthread_tsd_size);
}
if (guard) {
map = __mmap(0, size, PROT_NONE, MAP_PRIVATE|MAP_ANON, -1, 0);
if (map == MAP_FAILED) goto fail;
- if (__mprotect(map+guard, size-guard, PROT_READ|PROT_WRITE)) {
+ if (__mprotect(map+guard, size-guard, PROT_READ|PROT_WRITE)
+ && errno != ENOSYS) {
__munmap(map, size);
goto fail;
}
if (do_sched) {
ret = __syscall(SYS_sched_setscheduler, new->tid,
attr._a_policy, &attr._a_prio);
- a_store(new->startlock, ret<0 ? 2 : 0);
+ a_store(new->startlock, ret<0 ? 2 : 3);
__wake(new->startlock, 1, 1);
if (ret < 0) return -ret;
}