As well as patches from Anders, this commit includes some older changes

that hadn't been checked in. Those are to finish off the original TSD management
scheme which will now start to be replaced by John Bossom's implementation.
Anders' description of his changes:-
Fixes the problem with
`TryEnterCriticalSection' on w95 systems. Instead
of directly calling `TryEnterCriticalSection' it
tries to get a pointer at DLL startup and only calls
the function if it exists. See ChangeLog for things
changed.
1998-12-05  Anders Norlander  <anorland@hem2.passagen.se>
	* implement.h (_pthread_try_enter_critical_section): New extern
	* dll.c (_pthread_try_enter_critical_section): New pointer to
	TryEnterCriticalSection if it exists; otherwise NULL.
	* dll.c (PthreadsEntryPoint):
	Initialize _pthread_try_enter_critical_section at startup
	and release kernel32 handle when DLL is being unloaded.
	* mutex.c (pthread_mutex_trylock): Replaced check for NT with
	a check if _pthread_try_enter_critical_section is valid
	pointer to a function. Call _pthread_try_enter_critical_section
	instead of TryEnterCriticalSection to avoid errors on Win95.
Sun Nov 15 21:24:06 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
	* cleanup.c (_pthread_destructor_run_all): Declare missing void * arg.
	Fixup CVS merge conflicts.
Fri Oct 30 15:15:50 1998  Ross Johnson  <rpj@swan.canberra.edu.au>
	* cleanup.c (_pthread_handler_push): Fixed bug appending new
	handler to list reported by Peter Slacik
	<Peter.Slacik@leibinger.freinet.de>.
	(new_thread): Rename poorly named local variable to
	"new_handler".
Sat Oct 24 18:34:59 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
	* global.c: Add TSD key management array and index declarations.
	* implement.h: Ditto for externs.
Fri Oct 23 00:08:09 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
	* implement.h (_PTHREAD_TSD_KEY_REUSE): Add enum.
	* private.c (_pthread_delete_thread): Add call to
	_pthread_destructor_run_all() to clean up the threads keys.
	* cleanup.c (_pthread_destructor_run_all): Check for no more dirty
	keys to run destructors on. Assume that the destructor call always
	succeeds and set the key value to NULL.

1 files changed, 58 insertions, 5 deletions

diff --git a/cleanup.c b/cleanup.c
index 1eac9f3..0c8f875 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -127,6 +127,7 @@ _pthread_destructor_run_all()
 {
   _pthread_tsd_key_t * key;
   int count;
+  int dirty;
 
   /* This threads private keys */
   key = _pthread_tsd_key_table;
@@ -139,24 +140,76 @@ _pthread_destructor_run_all()
   for (count = 0; count < PTHREAD_DESTRUCTOR_ITERATIONS; count++)
     {
       int k;
+      void * arg;
+
+      dirty = 0;
 
       /* Loop through all keys. */
       for (k = 0; k < _POSIX_THREAD_KEYS_MAX; k++)
 	{
-	  /* If there's no destructor or the key isn't in use, skip it. */
-	  if (key->destructor != NULL && key->in_use == _PTHREAD_TSD_KEY_INUSE)
-	    {
-	      void * arg;
+	  /* CRITICAL SECTION */
+	  pthread_mutex_lock(&_pthread_tsd_mutex);
 
+	  switch (key->status)
+	    {
+	    case _PTHREAD_TSD_KEY_INUSE:
 	      arg = pthread_getspecific((pthread_key_t) k);
 
-	      if (arg != NULL)
+	      if (arg != NULL && key->destructor != NULL)
 		{
+		  /* The destructor must be called with the mutex off. */
+		  pthread_mutex_unlock(&_pthread_tsd_mutex);
+		  /* END CRITICAL SECTION */
+
+		  /* FIXME: Is the destructor supposed to set the key value
+		     to NULL? How is this done when arg is the key value, not
+		     a pointer to it? For now we assume that the destructor
+		     always succeeds.
+		     */
 		  (void) (key->destructor)(arg);
+
+		  /* CRITICAL SECTION */
+		  pthread_mutex_lock(&_pthread_tsd_mutex);
+
+		  pthread_setspecific((pthread_key_t) k, NULL);
+#if 0
+		  /* Only needed if we don't assume the destructor
+		     always succeeds.
+		     */
+		  dirty = 1;
+#endif
+		}
+	      break;
+
+	    case _PTHREAD_TSD_KEY_DELETED:
+	      key->status = _PTHREAD_TSD_KEY_INUSE;
+	      pthread_setspecific((pthread_key_t) k, NULL);
+
+	      if (key->in_use <= 0)
+		{
+		  /* This is the last thread to use this
+		     deleted key. It can now be made available
+		     for re-use.
+		   */
+		  key->status = _PTHREAD_TSD_KEY_REUSE;
+		}
+	      else
+		{
+		  key->status = _PTHREAD_TSD_KEY_DELETED;
 		}
+	      break;
+
+	    default:
+	      break;
 	    }
 
+	  pthread_mutex_unlock(&_pthread_tsd_mutex);
+	  /* END CRITICAL SECTION */
+
 	  key++;
 	}
+
+      if (!dirty)
+	break;
     }
 }