RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

omit pthread tsd dtor code if tsd is not used

This commit is contained in:
Rich Felker 2011-04-03 02:33:50 -04:00
parent 8de03e1a90
commit fd80cfa00b
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/thread/pthread_create.c
View File

@ -1,5 +1,10 @@
#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 #ifdef __pthread_unwind_next
#undef __pthread_unwind_next #undef __pthread_unwind_next
#define __pthread_unwind_next __pthread_unwind_next_3 #define __pthread_unwind_next __pthread_unwind_next_3
@ -7,7 +12,6 @@
void __pthread_unwind_next(struct __ptcb *cb) void __pthread_unwind_next(struct __ptcb *cb)
{ {
int i, j, not_finished;
pthread_t self; pthread_t self;
if (cb->__next) longjmp((void *)cb->__next->__jb, 1); if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
@ -16,18 +20,7 @@ void __pthread_unwind_next(struct __ptcb *cb)
LOCK(&self->exitlock); LOCK(&self->exitlock);
not_finished = self->tsd_used; __pthread_tsd_run_dtors(self);
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;
}
}
}
/* Mark this thread dead before decrementing count */ /* Mark this thread dead before decrementing count */
self->dead = 1; self->dead = 1;

19
src/thread/pthread_key_create.c
View File

@ -3,13 +3,14 @@
const size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX; const size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX;
void *__pthread_tsd_main[PTHREAD_KEYS_MAX] = { 0 }; void *__pthread_tsd_main[PTHREAD_KEYS_MAX] = { 0 };
static void (*keys[PTHREAD_KEYS_MAX])(void *);
static void nodtor(void *dummy) static void nodtor(void *dummy)
{ {
} }
int pthread_key_create(pthread_key_t *k, void (*dtor)(void *)) int pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
{ {
static void (*keys[PTHREAD_KEYS_MAX])(void *);
unsigned i = (uintptr_t)&k / 16 % PTHREAD_KEYS_MAX; unsigned i = (uintptr_t)&k / 16 % PTHREAD_KEYS_MAX;
unsigned j = i; unsigned j = i;
@ -24,3 +25,19 @@ int pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
} while ((j=(j+1)%PTHREAD_KEYS_MAX) != i); } while ((j=(j+1)%PTHREAD_KEYS_MAX) != i);
return EAGAIN; return EAGAIN;
} }
void __pthread_tsd_run_dtors(pthread_t self)
{
int i, j, 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] && keys[i]) {
void *tmp = self->tsd[i];
self->tsd[i] = 0;
keys[i](tmp);
not_finished = 1;
}
}
}
}