X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_create.c;h=a6afd1e584873825dd4c3e2793b497fddddff236;hp=856015ff01762dcc65ae12b37b06462e19987009;hb=730bee725a770b543181424b52203dd1634ab5d1;hpb=acb04806628990ad2430e04261dd20f23babde5e diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index 856015ff..a6afd1e5 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -1,4 +1,5 @@ #include "pthread_impl.h" +#include "stdio_impl.h" static void dummy_0() { @@ -7,12 +8,7 @@ weak_alias(dummy_0, __synccall_lock); weak_alias(dummy_0, __synccall_unlock); weak_alias(dummy_0, __pthread_tsd_run_dtors); -#ifdef __pthread_unwind_next -#undef __pthread_unwind_next -#define __pthread_unwind_next __pthread_unwind_next_3 -#endif - -void __pthread_unwind_next(struct __ptcb *cb) +void __pthread_do_unwind(struct __ptcb *cb) { pthread_t self = pthread_self(); int n; @@ -60,6 +56,16 @@ int __uniclone(void *, int (*)(), void *); static const size_t dummy = 0; weak_alias(dummy, __pthread_tsd_size); +static FILE *const dummy_file = 0; +weak_alias(dummy_file, __stdin_used); +weak_alias(dummy_file, __stdout_used); +weak_alias(dummy_file, __stderr_used); + +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) { int ret; @@ -70,6 +76,11 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo if (!self) return ENOSYS; if (!libc.threaded) { + for (FILE *f=libc.ofl_head; f; f=f->next) + init_file_lock(f); + 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; }