projects
/
oweals
/
musl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
synchronize cond var destruction with exiting waits
[oweals/musl.git]
/
src
/
thread
/
pthread_create.c
diff --git
a/src/thread/pthread_create.c
b/src/thread/pthread_create.c
index d60c2a4d3b8442f2a2bba1ee3855096b84261e6c..0189f02844f1e7af23f25e273b6ff321fdbceb57 100644
(file)
--- a/
src/thread/pthread_create.c
+++ b/
src/thread/pthread_create.c
@@
-1,18
+1,14
@@
#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);
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;
{
pthread_t self = pthread_self();
int n;
@@
-43,23
+39,44
@@
void __pthread_unwind_next(struct __ptcb *cb)
__syscall(SYS_exit, 0);
}
__syscall(SYS_exit, 0);
}
+void __pthread_do_register(struct __ptcb *cb)
+{
+ struct pthread *self = pthread_self();
+ cb->__next = self->cancelbuf;
+ self->cancelbuf = cb;
+}
+
+void __pthread_do_unregister(struct __ptcb *cb)
+{
+ struct pthread *self = __pthread_self();
+ self->cancelbuf = self->cancelbuf->__next;
+}
+
static int start(void *p)
{
static int start(void *p)
{
-
struct pthread *
self = p;
+
pthread_t
self = p;
if (self->unblock_cancel)
__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
pthread_exit(self->start(self->start_arg));
return 0;
}
if (self->unblock_cancel)
__syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
pthread_exit(self->start(self->start_arg));
return 0;
}
-int __uniclone(void *, int (*)(), void *);
-
#define ROUND(x) (((x)+PAGE_SIZE-1)&-PAGE_SIZE)
/* pthread_key_create.c overrides this */
static const size_t dummy = 0;
weak_alias(dummy, __pthread_tsd_size);
#define ROUND(x) (((x)+PAGE_SIZE-1)&-PAGE_SIZE)
/* pthread_key_create.c overrides this */
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
+87,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;
}
@@
-80,7
+102,7
@@
int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
}
size += __pthread_tsd_size;
map = mmap(0, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0);
}
size += __pthread_tsd_size;
map = mmap(0, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0);
- if (
!map
) return EAGAIN;
+ if (
map == MAP_FAILED
) return EAGAIN;
if (guard) mprotect(map, guard, PROT_NONE);
tsd = map + size - __pthread_tsd_size;
if (guard) mprotect(map, guard, PROT_NONE);
tsd = map + size - __pthread_tsd_size;
@@
-95,16
+117,14
@@
int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
new->tsd = (void *)tsd;
if (attr) new->detached = attr->_a_detach;
new->unblock_cancel = self->cancel;
new->tsd = (void *)tsd;
if (attr) new->detached = attr->_a_detach;
new->unblock_cancel = self->cancel;
- memcpy(new->tlsdesc, self->tlsdesc, sizeof new->tlsdesc);
- new->tlsdesc[1] = (uintptr_t)new;
- stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15);
+ stack = (void *)new;
- __
rsys
call_lock();
+ __
sync
call_lock();
a_inc(&libc.threads_minus_1);
a_inc(&libc.threads_minus_1);
- ret = __
uniclone(stack, start, new
);
+ ret = __
clone(start, stack, 0x7d8f00, new, &new->tid, new, &new->tid
);
- __
rsys
call_unlock();
+ __
sync
call_unlock();
if (ret < 0) {
a_dec(&libc.threads_minus_1);
if (ret < 0) {
a_dec(&libc.threads_minus_1);
@@
-120,5
+140,5
@@
void pthread_exit(void *result)
struct pthread *self = pthread_self();
struct __ptcb cb = { .__next = self->cancelbuf };
self->result = result;
struct pthread *self = pthread_self();
struct __ptcb cb = { .__next = self->cancelbuf };
self->result = result;
- __pthread_
unwind_next
(&cb);
+ __pthread_
do_unwind
(&cb);
}
}