From fd80cfa00b34ec81b3049b98c66f6a45301ca6c4 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Sun, 3 Apr 2011 02:33:50 -0400
Subject: omit pthread tsd dtor code if tsd is not used

---
 src/thread/pthread_create.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'src/thread/pthread_create.c')

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;
-- 
cgit v1.2.1