projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipv6 parsing code (formerly dummied-out)
[musl]
/
src
/
thread
/
pthread_create.c
diff --git
a/src/thread/pthread_create.c
b/src/thread/pthread_create.c
index
844d7bf
..
0d2c17b
100644
(file)
--- a/
src/thread/pthread_create.c
+++ b/
src/thread/pthread_create.c
@@
-5,11
+5,7
@@
static void dummy_0()
}
weak_alias(dummy_0, __rsyscall_lock);
weak_alias(dummy_0, __rsyscall_unlock);
}
weak_alias(dummy_0, __rsyscall_lock);
weak_alias(dummy_0, __rsyscall_unlock);
-
-static void dummy_1(pthread_t self)
-{
-}
-weak_alias(dummy_1, __pthread_tsd_run_dtors);
+weak_alias(dummy_0, __pthread_tsd_run_dtors);
#ifdef __pthread_unwind_next
#undef __pthread_unwind_next
#ifdef __pthread_unwind_next
#undef __pthread_unwind_next
@@
-18,16
+14,17
@@
weak_alias(dummy_1, __pthread_tsd_run_dtors);
void __pthread_unwind_next(struct __ptcb *cb)
{
void __pthread_unwind_next(struct __ptcb *cb)
{
- pthread_t self;
+ pthread_t self
= pthread_self()
;
int n;
int n;
- if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
-
- self = pthread_self();
+ if (cb->__next) {
+ self->cancelbuf = cb->__next->__next;
+ longjmp((void *)cb->__next->__jb, 1);
+ }
LOCK(&self->exitlock);
LOCK(&self->exitlock);
- __pthread_tsd_run_dtors(
self
);
+ __pthread_tsd_run_dtors();
/* Mark this thread dead before decrementing count */
self->dead = 1;
/* Mark this thread dead before decrementing count */
self->dead = 1;
@@
-44,18
+41,6
@@
void __pthread_unwind_next(struct __ptcb *cb)
__syscall(SYS_exit, 0);
}
__syscall(SYS_exit, 0);
}
-static void init_threads()
-{
- sigset_t set;
- libc.lock = __lock;
- libc.lockfile = __lockfile;
-
- sigemptyset(&set);
- sigaddset(&set, SIGSYSCALL);
- sigaddset(&set, SIGCANCEL);
- __libc_sigprocmask(SIG_UNBLOCK, &set, 0);
-}
-
static int start(void *p)
{
struct pthread *self = p;
static int start(void *p)
{
struct pthread *self = p;
@@
-79,7
+64,6
@@
weak_alias(dummy, __pthread_tsd_size);
int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(void *), void *arg)
{
int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(void *), void *arg)
{
- static int init;
int ret;
size_t size, guard;
struct pthread *self = pthread_self(), *new;
int ret;
size_t size, guard;
struct pthread *self = pthread_self(), *new;
@@
-87,7
+71,14
@@
int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
const pthread_attr_t default_attr = { 0 };
if (!self) return ENOSYS;
const pthread_attr_t default_attr = { 0 };
if (!self) return ENOSYS;
- if (!init && ++init) init_threads();
+ if (!libc.threaded) {
+ sigset_t set;
+ sigemptyset(&set);
+ sigaddset(&set, SIGSYSCALL);
+ sigaddset(&set, SIGCANCEL);
+ __libc_sigprocmask(SIG_UNBLOCK, &set, 0);
+ libc.threaded = 1;
+ }
if (!attr) attr = &default_attr;
guard = ROUND(attr->_a_guardsize + DEFAULT_GUARD_SIZE);
if (!attr) attr = &default_attr;
guard = ROUND(attr->_a_guardsize + DEFAULT_GUARD_SIZE);
@@
-110,7
+101,6
@@
int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
new->detached = attr->_a_detach;
new->attr = *attr;
new->unblock_cancel = self->cancel;
new->detached = attr->_a_detach;
new->attr = *attr;
new->unblock_cancel = self->cancel;
- new->result = PTHREAD_CANCELED;
memcpy(new->tlsdesc, self->tlsdesc, sizeof new->tlsdesc);
new->tlsdesc[1] = (uintptr_t)new;
stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15);
memcpy(new->tlsdesc, self->tlsdesc, sizeof new->tlsdesc);
new->tlsdesc[1] = (uintptr_t)new;
stack = (void *)((uintptr_t)new-1 & ~(uintptr_t)15);
@@
-136,7
+126,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;
- self->canceldisable = 1;
- self->cancelasync = 0;
__pthread_unwind_next(&cb);
}
__pthread_unwind_next(&cb);
}