remove no-longer-needed unblocking of signals in pthread_create

[musl] / src / thread / pthread_key_create.c

diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c
index 8d7f816..e51cb02 100644 (file)
--- a/src/thread/pthread_key_create.c
+++ b/src/thread/pthread_key_create.c
@@ -3,18 +3,18 @@
 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;
 
-       pthread_self();
-       libc.tsd_keys = keys;
+       __pthread_self_init();
        if (!dtor) dtor = nodtor;
        do {
                if (!a_cas_p(keys+j, 0, dtor)) {
@@ -24,3 +24,26 @@ int pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
        } 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;
+                       }
+               }
+       }
+}