resolve merge

1 files changed, 89 insertions, 134 deletions

diff --git a/libpthread/linuxthreads/specific.c b/libpthread/linuxthreads/specific.c
index 0daad83f5..c4bcfbf8c 100644
--- a/libpthread/linuxthreads/specific.c
+++ b/libpthread/linuxthreads/specific.c
@@ -14,6 +14,7 @@
 
 /* Thread-specific data */
 
+#include <features.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -21,8 +22,6 @@
 #include "internals.h"
 #include "spinlock.h"
 #include "restart.h"
-#include <bits/libc-lock.h>
-#include <not-cancel.h>
 
 /* Table of keys. */
 
@@ -39,177 +38,133 @@ static pthread_mutex_t pthread_keys_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* Create a new key */
 
-int __pthread_key_create(pthread_key_t * key, destr_function destr)
+int pthread_key_create(pthread_key_t * key, destr_function destr)
 {
   int i;
 
-  pthread_mutex_lock(&pthread_keys_mutex);
+  __pthread_mutex_lock(&pthread_keys_mutex);
   for (i = 0; i < PTHREAD_KEYS_MAX; i++) {
     if (! pthread_keys[i].in_use) {
       /* Mark key in use */
       pthread_keys[i].in_use = 1;
       pthread_keys[i].destr = destr;
-      pthread_mutex_unlock(&pthread_keys_mutex);
+      __pthread_mutex_unlock(&pthread_keys_mutex);
       *key = i;
       return 0;
     }
   }
-  pthread_mutex_unlock(&pthread_keys_mutex);
+  __pthread_mutex_unlock(&pthread_keys_mutex);
   return EAGAIN;
 }
-strong_alias (__pthread_key_create, pthread_key_create)
-
-/* Reset deleted key's value to NULL in each live thread.
- * NOTE: this executes in the context of the thread manager! */
-
-struct pthread_key_delete_helper_args {
-  /* Damn, we need lexical closures in C! ;) */
-  unsigned int idx1st, idx2nd;
-  pthread_descr self;
-};
-
-static void pthread_key_delete_helper(void *arg, pthread_descr th)
-{
-  struct pthread_key_delete_helper_args *args = arg;
-  unsigned int idx1st = args->idx1st;
-  unsigned int idx2nd = args->idx2nd;
-  pthread_descr self = args->self;
-
-  if (self == 0)
-    self = args->self = thread_self();
-
-  if (!th->p_terminated) {
-    /* pthread_exit() may try to free th->p_specific[idx1st] concurrently. */
-    __pthread_lock(th->p_lock, self);
-    if (th->p_specific[idx1st] != NULL)
-      th->p_specific[idx1st][idx2nd] = NULL;
-    __pthread_unlock(th->p_lock);
-  }
-}
 
 /* Delete a key */
 int pthread_key_delete(pthread_key_t key)
 {
-  pthread_descr self = thread_self();
-
-  pthread_mutex_lock(&pthread_keys_mutex);
-  if (key >= PTHREAD_KEYS_MAX || !pthread_keys[key].in_use) {
-    pthread_mutex_unlock(&pthread_keys_mutex);
-    return EINVAL;
-  }
-  pthread_keys[key].in_use = 0;
-  pthread_keys[key].destr = NULL;
-
-  /* Set the value of the key to NULL in all running threads, so
-     that if the key is reallocated later by pthread_key_create, its
-     associated values will be NULL in all threads.
-
-     If no threads have been created yet, or if we are exiting, clear
-     it just in the current thread.  */
-
-  struct pthread_key_delete_helper_args args;
-  args.idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
-  args.idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
-  if (__pthread_manager_request != -1
-      && !(__builtin_expect (__pthread_exit_requested, 0)))
-    {
-      struct pthread_request request;
+    pthread_descr self = thread_self();
 
-      args.self = 0;
-
-      request.req_thread = self;
-      request.req_kind = REQ_FOR_EACH_THREAD;
-      request.req_args.for_each.arg = &args;
-      request.req_args.for_each.fn = pthread_key_delete_helper;
-
-      TEMP_FAILURE_RETRY(write_not_cancel(__pthread_manager_request,
-					  (char *) &request, sizeof(request)));
-      suspend(self);
+    __pthread_mutex_lock(&pthread_keys_mutex);
+    if (key >= PTHREAD_KEYS_MAX || !pthread_keys[key].in_use) {
+	__pthread_mutex_unlock(&pthread_keys_mutex);
+	return EINVAL;
     }
-  else
+    pthread_keys[key].in_use = 0;
+    pthread_keys[key].destr = NULL;
+
+    /* Set the value of the key to NULL in all running threads, so
+       that if the key is reallocated later by pthread_key_create, its
+       associated values will be NULL in all threads.
+       Do nothing if no threads have been created yet.  */
+    if (__pthread_manager_request != -1)
     {
-      if (self->p_specific[args.idx1st] != NULL)
-	self->p_specific[args.idx1st][args.idx2nd] = NULL;
+	pthread_descr th;
+	unsigned int idx1st, idx2nd;
+
+	idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
+	idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
+	th = self;
+	do {
+	    /* If the thread already is terminated don't modify the memory.  */
+	    if (!th->p_terminated && th->p_specific[idx1st] != NULL)
+		th->p_specific[idx1st][idx2nd] = NULL;
+	    th = th->p_nextlive;
+	} while (th != self);
     }
 
-  pthread_mutex_unlock(&pthread_keys_mutex);
-  return 0;
+    __pthread_mutex_unlock(&pthread_keys_mutex);
+    return 0;
 }
 
 /* Set the value of a key */
 
-int __pthread_setspecific(pthread_key_t key, const void * pointer)
+int pthread_setspecific(pthread_key_t key, const void * pointer)
 {
-  pthread_descr self = thread_self();
-  unsigned int idx1st, idx2nd;
-
-  if (key >= PTHREAD_KEYS_MAX || !pthread_keys[key].in_use)
-    return EINVAL;
-  idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
-  idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
-  if (THREAD_GETMEM_NC(self, p_specific[idx1st]) == NULL) {
-    void *newp = calloc(PTHREAD_KEY_2NDLEVEL_SIZE, sizeof (void *));
-    if (newp == NULL)
-      return ENOMEM;
-    THREAD_SETMEM_NC(self, p_specific[idx1st], newp);
-  }
-  THREAD_GETMEM_NC(self, p_specific[idx1st])[idx2nd] = (void *) pointer;
-  return 0;
+    pthread_descr self = thread_self();
+    unsigned int idx1st, idx2nd;
+
+    if (key >= PTHREAD_KEYS_MAX || !pthread_keys[key].in_use)
+	return EINVAL;
+    idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
+    idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
+    if (THREAD_GETMEM_NC(self, p_specific[idx1st]) == NULL) {
+	void *newp = calloc(PTHREAD_KEY_2NDLEVEL_SIZE, sizeof (void *));
+	if (newp == NULL)
+	    return ENOMEM;
+	THREAD_SETMEM_NC(self, p_specific[idx1st], newp);
+    }
+    THREAD_GETMEM_NC(self, p_specific[idx1st])[idx2nd] = (void *) pointer;
+    return 0;
 }
-strong_alias (__pthread_setspecific, pthread_setspecific)
 
 /* Get the value of a key */
 
-void * __pthread_getspecific(pthread_key_t key)
+void * pthread_getspecific(pthread_key_t key)
 {
-  pthread_descr self = thread_self();
-  unsigned int idx1st, idx2nd;
-
-  if (key >= PTHREAD_KEYS_MAX)
-    return NULL;
-  idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
-  idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
-  if (THREAD_GETMEM_NC(self, p_specific[idx1st]) == NULL
-      || !pthread_keys[key].in_use)
-    return NULL;
-  return THREAD_GETMEM_NC(self, p_specific[idx1st])[idx2nd];
+    pthread_descr self = thread_self();
+    unsigned int idx1st, idx2nd;
+
+    if (key >= PTHREAD_KEYS_MAX)
+	return NULL;
+    idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
+    idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
+    if (THREAD_GETMEM_NC(self, p_specific[idx1st]) == NULL
+	    || !pthread_keys[key].in_use)
+	return NULL;
+    return THREAD_GETMEM_NC(self, p_specific[idx1st])[idx2nd];
 }
-strong_alias (__pthread_getspecific, pthread_getspecific)
 
 /* Call the destruction routines on all keys */
 
-void __pthread_destroy_specifics()
+void __pthread_destroy_specifics(void)
 {
-  pthread_descr self = thread_self();
-  int i, j, round, found_nonzero;
-  destr_function destr;
-  void * data;
-
-  for (round = 0, found_nonzero = 1;
-       found_nonzero && round < PTHREAD_DESTRUCTOR_ITERATIONS;
-       round++) {
-    found_nonzero = 0;
-    for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++)
-      if (THREAD_GETMEM_NC(self, p_specific[i]) != NULL)
-        for (j = 0; j < PTHREAD_KEY_2NDLEVEL_SIZE; j++) {
-          destr = pthread_keys[i * PTHREAD_KEY_2NDLEVEL_SIZE + j].destr;
-          data = THREAD_GETMEM_NC(self, p_specific[i])[j];
-          if (destr != NULL && data != NULL) {
-            THREAD_GETMEM_NC(self, p_specific[i])[j] = NULL;
-            destr(data);
-            found_nonzero = 1;
-          }
-        }
-  }
-  __pthread_lock(THREAD_GETMEM(self, p_lock), self);
-  for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++) {
-    if (THREAD_GETMEM_NC(self, p_specific[i]) != NULL) {
-      void *p = THREAD_GETMEM_NC(self, p_specific[i]);
-      THREAD_SETMEM_NC(self, p_specific[i], NULL);
-      free(p);
+    pthread_descr self = thread_self();
+    int i, j, round, found_nonzero;
+    destr_function destr;
+    void * data;
+
+    for (round = 0, found_nonzero = 1;
+	    found_nonzero && round < PTHREAD_DESTRUCTOR_ITERATIONS;
+	    round++) {
+	found_nonzero = 0;
+	for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++)
+	    if (THREAD_GETMEM_NC(self, p_specific[i]) != NULL)
+		for (j = 0; j < PTHREAD_KEY_2NDLEVEL_SIZE; j++) {
+		    destr = pthread_keys[i * PTHREAD_KEY_2NDLEVEL_SIZE + j].destr;
+		    data = THREAD_GETMEM_NC(self, p_specific[i])[j];
+		    if (destr != NULL && data != NULL) {
+			THREAD_GETMEM_NC(self, p_specific[i])[j] = NULL;
+			destr(data);
+			found_nonzero = 1;
+		    }
+		}
     }
-  }
-  __pthread_unlock(THREAD_GETMEM(self, p_lock));
+    __pthread_lock(THREAD_GETMEM(self, p_lock), self);
+    for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++) {
+	if (THREAD_GETMEM_NC(self, p_specific[i]) != NULL) {
+	    free(THREAD_GETMEM_NC(self, p_specific[i]));
+	    THREAD_SETMEM_NC(self, p_specific[i], NULL);
+	}
+    }
+    __pthread_unlock(THREAD_GETMEM(self, p_lock));
 }
 
 #if !defined __UCLIBC_HAS_TLS__ && defined __UCLIBC_HAS_RPC__