2002-09-21 Robert Collins <rbtcollins@hotmail.com>

        * thread.cc: Partial refactoring of pthread_key destructor
        handling. Loosely based on Thomas Pfaff's work.
        (pthread_key_destructor_list::Insert): Remove.
        (pthread_key_destructor_list::Pop): Remove.
        (pthread_key_destructor_list::IterateNull): Call the key's
        run_destructor method.
        (pthread_key::pthread_key): Initialize new member.
        (pthread_key::get): Mark as const for correctness.
        (pthread_key::run_destructor): Implement.
        * thread.h (pthread_key::get): Mark as const for correctness.
        (pthread_key::run_destructor): Declare.
        (List): New template class that implements a generic list.
        (pthread_key_destructor_list): Inherit from List, and remove
        now duplicate functions.

1 files changed, 10 insertions, 22 deletions

diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index 3d64d69b6..1683b21c0 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -73,16 +73,6 @@ pthread_key_destructor::Next ()
   return next;
 }
 
-void
-pthread_key_destructor_list::Insert (pthread_key_destructor *node)
-{
-  if (!node)
-    return;
-  head = node->InsertAfter (head);
-  if (!head)
-    head = node;		/*first node special case */
-}
-
   /*remove a given dataitem, wherever in the list it is */
 pthread_key_destructor *
 pthread_key_destructor_list::Remove (pthread_key *key)
@@ -103,15 +93,6 @@ pthread_key_destructor_list::Remove (pthread_key *key)
   return NULL;
 }
 
-  /*get the first item and remove at the same time */
-pthread_key_destructor *
-pthread_key_destructor_list::Pop ()
-{
-  pthread_key_destructor *temp = head;
-  head = head->Next ();
-  return temp;
-}
-
 pthread_key_destructor::
 pthread_key_destructor (void (*thedestructor) (void *), pthread_key *key)
 {
@@ -126,7 +107,7 @@ pthread_key_destructor_list::IterateNull ()
   pthread_key_destructor *temp = head;
   while (temp)
     {
-      temp->destructor ((temp->key)->get ());
+      temp->key->run_destructor ();
       temp = temp->Next ();
     }
 }
@@ -1056,7 +1037,7 @@ pthread_key::isGoodObject (pthread_key_t const *key)
 
 /* non-static members */
 
-pthread_key::pthread_key (void (*destructor) (void *)):verifyable_object (PTHREAD_KEY_MAGIC)
+pthread_key::pthread_key (void (*aDestructor) (void *)):verifyable_object (PTHREAD_KEY_MAGIC), destructor (aDestructor)
 {
   dwTlsIndex = TlsAlloc ();
   if (dwTlsIndex == TLS_OUT_OF_INDEXES)
@@ -1098,7 +1079,7 @@ pthread_key::set (const void *value)
 }
 
 void *
-pthread_key::get ()
+pthread_key::get () const
 {
   int savedError = ::GetLastError();
   void *result = TlsGetValue (dwTlsIndex);
@@ -1121,6 +1102,13 @@ pthread_key::recreateKeyFromBuffer ()
   set (fork_buf);
 }
 
+void
+pthread_key::run_destructor () const
+{
+  if (destructor)
+    destructor (get());
+}
+
 /*pshared mutexs:
 
  * REMOVED FROM CURRENT. These can be reinstated with the daemon, when all the