Fri Jul 31 00:05:45 1998 Ross Johnson <rpj@ixobrychus.canberra.edu.au>

	* tsd.c (pthread_key_create): Update to properly associate
	the destructor routine with the key.

	* exit.c (_pthread_vacuum): Add call to
	_pthread_destructor_pop_all().

1 files changed, 5 insertions, 9 deletions

diff --git a/tsd.c b/tsd.c
index 611ed5f..4a83fd9 100644
--- a/tsd.c
+++ b/tsd.c
@@ -12,15 +12,6 @@ pthread_key_create(pthread_key_t *key, void (*destructor)(void *))
 {
   DWORD index;
 
-  /* FIXME: the destructor function is ignored for now.  This needs to
-     be managed via the same cleanup handler mechanism as user-define
-     cleanup handlers during a thread exit. */
-
-  if (destructor != NULL)
-    {
-      return EINVAL;
-    }
-
   index = TlsAlloc();
   if (index == 0xFFFFFFFF)
     {
@@ -30,6 +21,11 @@ pthread_key_create(pthread_key_t *key, void (*destructor)(void *))
   /* Only modify the `key' parameter if allocation was successful. */
   *key = index;
 
+  if (destructor != NULL)
+    {
+      return (_pthread_destructor_push(destructor, *key));
+    }
+
   return 0;
 }