X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_key_create.c;h=e51cb02325d4908a8ac91b58d6b6afde47a5af6d;hp=52c09734b031dfaff67fb38e5332ad22e5978015;hb=d5fd1fa48564a5528f53e5b1cab5063a0545d7f7;hpb=b480808a6a511c9350a6559b63938ac261c83a76

diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c
index 52c09734..e51cb023 100644
--- a/src/thread/pthread_key_create.c
+++ b/src/thread/pthread_key_create.c
@@ -1,6 +1,9 @@
 #include "pthread_impl.h"
 
 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)
 {
@@ -8,19 +11,39 @@ static void nodtor(void *dummy)
 
 int pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
 {
-	static void (*keys[PTHREAD_KEYS_MAX])(void *);
-	int i = (uintptr_t)&k / 16 % PTHREAD_KEYS_MAX;
-	int j = i;
+	unsigned i = (uintptr_t)&k / 16 % PTHREAD_KEYS_MAX;
+	unsigned j = i;
 
-	pthread_self();
-	libc.tsd_keys = keys;
+	__pthread_self_init();
 	if (!dtor) dtor = nodtor;
-	/* Cheap trick - &k cannot match any destructor pointer */
-	while (a_cas_p(keys+j, 0, &k)
-		&& (j=(j+1)%PTHREAD_KEYS_MAX) != i);
-	if (keys[j] != (void (*)(void *))&k)
-		return EAGAIN;
-	keys[j] = dtor;
-	*k = j;
+	do {
+		if (!a_cas_p(keys+j, 0, dtor)) {
+			*k = j;
+			return 0;
+		}
+	} while ((j=(j+1)%PTHREAD_KEYS_MAX) != i);
+	return EAGAIN;
+}
+
+int pthread_key_delete(pthread_key_t k)
+{
+	keys[k] = 0;
 	return 0;
 }
+
+void __pthread_tsd_run_dtors()
+{
+	pthread_t self = __pthread_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;
+			}
+		}
+	}
+}