summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-04-03 02:33:50 -0400
committerRich Felker <dalias@aerifal.cx>2011-04-03 02:33:50 -0400
commitfd80cfa00b34ec81b3049b98c66f6a45301ca6c4 (patch)
treea37a653aad86ebc75af56a44bf0a3721d344660a
parent8de03e1a90e60f62806c488cfa4985f99e869f87 (diff)
downloadmusl-fd80cfa00b34ec81b3049b98c66f6a45301ca6c4.tar.gz
omit pthread tsd dtor code if tsd is not used
-rw-r--r--src/thread/pthread_create.c19
-rw-r--r--src/thread/pthread_key_create.c19
2 files changed, 24 insertions, 14 deletions
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index d2344f15..6f1bb0e8 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -1,5 +1,10 @@
#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
@@ -7,7 +12,6 @@
void __pthread_unwind_next(struct __ptcb *cb)
{
- int i, j, not_finished;
pthread_t self;
if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
@@ -16,18 +20,7 @@ void __pthread_unwind_next(struct __ptcb *cb)
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;
diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c
index 8d7f8162..2316a46f 100644
--- a/src/thread/pthread_key_create.c
+++ b/src/thread/pthread_key_create.c
@@ -3,13 +3,14 @@
const size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX;
void *__pthread_tsd_main[PTHREAD_KEYS_MAX] = { 0 };
+static void (*keys[PTHREAD_KEYS_MAX])(void *);
+
static void nodtor(void *dummy)
{
}
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 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);
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;
+ }
+ }
+ }
+}