omit pthread tsd dtor code if tsd is not used

1 files changed, 18 insertions, 1 deletions

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;
+			}
+		}
+	}
+}