projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add timerfd interfaces (untested)
[musl]
/
src
/
thread
/
pthread_create.c
diff --git
a/src/thread/pthread_create.c
b/src/thread/pthread_create.c
index
ae2f9e4
..
d8b8f0f
100644
(file)
--- a/
src/thread/pthread_create.c
+++ b/
src/thread/pthread_create.c
@@
-8,7
+8,7
@@
weak_alias(dummy_0, __synccall_lock);
weak_alias(dummy_0, __synccall_unlock);
weak_alias(dummy_0, __pthread_tsd_run_dtors);
weak_alias(dummy_0, __synccall_unlock);
weak_alias(dummy_0, __pthread_tsd_run_dtors);
-void pthread_exit(void *result)
+
_Noreturn
void pthread_exit(void *result)
{
pthread_t self = pthread_self();
int n;
{
pthread_t self = pthread_self();
int n;
@@
-24,12
+24,12
@@
void pthread_exit(void *result)
__pthread_tsd_run_dtors();
__pthread_tsd_run_dtors();
- __lock(
&
self->exitlock);
+ __lock(self->exitlock);
/* Mark this thread dead before decrementing count */
/* Mark this thread dead before decrementing count */
- __lock(
&
self->killlock);
+ __lock(self->killlock);
self->dead = 1;
self->dead = 1;
-
a_store(&self->killlock, 0
);
+
__unlock(self->killlock
);
do n = libc.threads_minus_1;
while (n && a_cas(&libc.threads_minus_1, n, n-1)!=n);
do n = libc.threads_minus_1;
while (n && a_cas(&libc.threads_minus_1, n, n-1)!=n);
@@
-38,11
+38,12
@@
void pthread_exit(void *result)
if (self->detached && self->map_base) {
if (self->detached == 2)
__syscall(SYS_set_tid_address, 0);
if (self->detached && self->map_base) {
if (self->detached == 2)
__syscall(SYS_set_tid_address, 0);
- __syscall(SYS_rt_sigprocmask, SIG_BLOCK, (uint64_t[]){-1},0,8);
+ __syscall(SYS_rt_sigprocmask, SIG_BLOCK,
+ SIGALL_SET, 0, __SYSCALL_SSLEN);
__unmapself(self->map_base, self->map_size);
}
__unmapself(self->map_base, self->map_size);
}
- __syscall(SYS_exit, 0);
+
for (;;)
__syscall(SYS_exit, 0);
}
void __do_cleanup_push(struct __ptcb *cb)
}
void __do_cleanup_push(struct __ptcb *cb)
@@
-61,7
+62,8
@@
static int start(void *p)
{
pthread_t self = p;
if (self->unblock_cancel)
{
pthread_t self = p;
if (self->unblock_cancel)
- __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, 8);
+ __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
+ SIGPT_SET, 0, __SYSCALL_SSLEN);
pthread_exit(self->start(self->start_arg));
return 0;
}
pthread_exit(self->start(self->start_arg));
return 0;
}
@@
-82,7
+84,7
@@
static void init_file_lock(FILE *f)
if (f && f->lock<0) f->lock = 0;
}
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 pthread_create(pthread_t *res
trict res, const pthread_attr_t *restrict attr, void *(*entry)(void *), void *restrict
arg)
{
int ret;
size_t size = DEFAULT_STACK_SIZE + DEFAULT_GUARD_SIZE;
{
int ret;
size_t size = DEFAULT_STACK_SIZE + DEFAULT_GUARD_SIZE;