projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
overhaul posix semaphores to fix destructability race
[musl]
/
src
/
thread
/
pthread_create.c
diff --git
a/src/thread/pthread_create.c
b/src/thread/pthread_create.c
index
d60c2a4
..
adef510
100644
(file)
--- a/
src/thread/pthread_create.c
+++ b/
src/thread/pthread_create.c
@@
-1,10
+1,11
@@
#include "pthread_impl.h"
#include "pthread_impl.h"
+#include "stdio_impl.h"
static void dummy_0()
{
}
static void dummy_0()
{
}
-weak_alias(dummy_0, __
rsys
call_lock);
-weak_alias(dummy_0, __
rsys
call_unlock);
+weak_alias(dummy_0, __
sync
call_lock);
+weak_alias(dummy_0, __
sync
call_unlock);
weak_alias(dummy_0, __pthread_tsd_run_dtors);
#ifdef __pthread_unwind_next
weak_alias(dummy_0, __pthread_tsd_run_dtors);
#ifdef __pthread_unwind_next
@@
-60,6
+61,16
@@
int __uniclone(void *, int (*)(), void *);
static const size_t dummy = 0;
weak_alias(dummy, __pthread_tsd_size);
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;
int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(void *), void *arg)
{
int ret;
@@
-70,6
+81,11
@@
int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
if (!self) return ENOSYS;
if (!libc.threaded) {
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;
}
__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
libc.threaded = 1;
}
@@
-99,12
+115,12
@@
int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
new->tlsdesc[1] = (uintptr_t)new;
stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15);
new->tlsdesc[1] = (uintptr_t)new;
stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15);
- __
rsys
call_lock();
+ __
sync
call_lock();
a_inc(&libc.threads_minus_1);
ret = __uniclone(stack, start, new);
a_inc(&libc.threads_minus_1);
ret = __uniclone(stack, start, new);
- __
rsys
call_unlock();
+ __
sync
call_unlock();
if (ret < 0) {
a_dec(&libc.threads_minus_1);
if (ret < 0) {
a_dec(&libc.threads_minus_1);