projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
omit pthread tsd dtor code if tsd is not used
[musl]
/
src
/
thread
/
pthread_create.c
diff --git
a/src/thread/pthread_create.c
b/src/thread/pthread_create.c
index
9b6385f
..
6f1bb0e
100644
(file)
--- a/
src/thread/pthread_create.c
+++ b/
src/thread/pthread_create.c
@@
-1,29
+1,26
@@
#include "pthread_impl.h"
#include "pthread_impl.h"
+static void dummy_1(pthread_t self)
+{
+}
+weak_alias(dummy_1, __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_unwind_next(struct __ptcb *cb)
{
- int i, j, not_finished;
pthread_t self;
if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
self = pthread_self();
pthread_t self;
if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
self = pthread_self();
- if (self->cancel) self->result = PTHREAD_CANCELLED;
LOCK(&self->exitlock);
LOCK(&self->exitlock);
- not_finished = self->tsd_used;
- for (j=0; not_finished && j<PTHREAD_DESTRUCTOR_ITERATIONS; j++) {
- not_finished = 0;
- for (i=0; i<PTHREAD_KEYS_MAX; i++) {
- if (self->tsd[i] && libc.tsd_keys[i]) {
- void *tmp = self->tsd[i];
- self->tsd[i] = 0;
- libc.tsd_keys[i](tmp);
- not_finished = 1;
- }
- }
- }
+ __pthread_tsd_run_dtors(self);
/* Mark this thread dead before decrementing count */
self->dead = 1;
/* Mark this thread dead before decrementing count */
self->dead = 1;
@@
-32,35
+29,40
@@
void __pthread_unwind_next(struct __ptcb *cb)
exit(0);
if (self->detached && self->map_base) {
exit(0);
if (self->detached && self->map_base) {
- syscall
4
(__NR_rt_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1},0,8);
+ syscall(__NR_rt_sigprocmask, SIG_BLOCK, (long)(uint64_t[1]){-1},0,8);
__unmapself(self->map_base, self->map_size);
}
__unmapself(self->map_base, self->map_size);
}
-
__syscall_exit(
0);
+
syscall(SYS_exit,
0);
}
static void docancel(struct pthread *self)
{
struct __ptcb cb = { .__next = self->cancelbuf };
}
static void docancel(struct pthread *self)
{
struct __ptcb cb = { .__next = self->cancelbuf };
+ self->canceldisable = 1;
+ self->cancelasync = 0;
__pthread_unwind_next(&cb);
}
static void cancel_handler(int sig, siginfo_t *si, void *ctx)
{
struct pthread *self = __pthread_self();
__pthread_unwind_next(&cb);
}
static void cancel_handler(int sig, siginfo_t *si, void *ctx)
{
struct pthread *self = __pthread_self();
- if (
si->si_code > 0 || si->si_pid != self->pid) return;
- self->cancel = 1;
- if (self->canceldisable || (!self->cancelasync && !self->cancelpoint))
+ if (
!self->cancel) {
+ if (si->si_code == SI_TIMER && libc.sigtimer)
+ libc.sigtimer(sig, si, ctx);
return;
return;
- docancel(self);
+ }
+ if (self->canceldisable) return;
+ if (self->cancelasync || (self->cancelpoint==1 && PC_AT_SYS(ctx)))
+ docancel(self);
}
static void cancelpt(int x)
{
struct pthread *self = __pthread_self();
if (self->canceldisable) return;
}
static void cancelpt(int x)
{
struct pthread *self = __pthread_self();
if (self->canceldisable) return;
- self->cancelpoint = x;
-
if (self->cancel)
docancel(self);
+ if ((self->cancelpoint+=x)==1 && x>=0 && self->cancel)
+
docancel(self);
}
/* "rsyscall" is a mechanism by which a thread can synchronously force all
}
/* "rsyscall" is a mechanism by which a thread can synchronously force all
@@
-91,7
+93,7
@@
static void rsyscall_handler(int sig, siginfo_t *si, void *ctx)
return;
}
return;
}
- if (syscall
6
(rs.nr, rs.arg[0], rs.arg[1], rs.arg[2],
+ if (syscall(rs.nr, rs.arg[0], rs.arg[1], rs.arg[2],
rs.arg[3], rs.arg[4], rs.arg[5]) < 0 && !rs.err) rs.err=errno;
a_inc(&rs.cnt);
rs.arg[3], rs.arg[4], rs.arg[5]) < 0 && !rs.err) rs.err=errno;
a_inc(&rs.cnt);
@@
-140,7
+142,7
@@
static int rsyscall(int nr, long a, long b, long c, long d, long e, long f)
while((i=rs.cnt)) __wait(&rs.cnt, 0, i, 1);
if (rs.err) errno = rs.err, ret = -1;
while((i=rs.cnt)) __wait(&rs.cnt, 0, i, 1);
if (rs.err) errno = rs.err, ret = -1;
- else ret = syscall
6
(nr, a, b, c, d, e, f);
+ else ret = syscall(nr, a, b, c, d, e, f);
UNLOCK(&rs.lock);
return ret;
UNLOCK(&rs.lock);
return ret;
@@
-165,6
+167,12
@@
static void init_threads()
static int start(void *p)
{
struct pthread *self = p;
static int start(void *p)
{
struct pthread *self = p;
+ if (self->unblock_cancel) {
+ sigset_t set;
+ sigemptyset(&set);
+ sigaddset(&set, SIGCANCEL);
+ __libc_sigprocmask(SIG_UNBLOCK, &set, 0);
+ }
pthread_exit(self->start(self->start_arg));
return 0;
}
pthread_exit(self->start(self->start_arg));
return 0;
}
@@
-195,7
+203,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);
if (!map) return EAGAIN;
size += __pthread_tsd_size;
map = mmap(0, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0);
if (!map) return EAGAIN;
- mprotect(map, guard, PROT_NONE);
+
if (guard)
mprotect(map, guard, PROT_NONE);
tsd = map + size - __pthread_tsd_size;
new = (void *)(tsd - sizeof *new - PAGE_SIZE%sizeof *new);
tsd = map + size - __pthread_tsd_size;
new = (void *)(tsd - sizeof *new - PAGE_SIZE%sizeof *new);
@@
-209,6
+217,8
@@
int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
new->tsd = (void *)tsd;
new->detached = attr->_a_detach;
new->attr = *attr;
new->tsd = (void *)tsd;
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);