merge trunk

1 files changed, 8 insertions, 2 deletions

diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 5030086..44c5607 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -662,7 +662,7 @@ void
 TclpInitAllocCache(void)
 {
     pthread_mutex_lock(allocLockPtr);
-    pthread_key_create(&key, TclpFreeAllocCache);
+    pthread_key_create(&key, NULL);
     pthread_mutex_unlock(allocLockPtr);
 }
 
@@ -672,13 +672,19 @@ TclpFreeAllocCache(
 {
     if (ptr != NULL) {
 	/*
-	 * Called by the pthread lib when a thread exits
+	 * Called by TclFinalizeThreadAllocThread() during the thread
+	 * finalization initiated from Tcl_FinalizeThread()
 	 */
 
 	TclFreeAllocCache(ptr);
 	pthread_setspecific(key, NULL);
 
     } else {
+	/*
+	 * Called by TclFinalizeThreadAlloc() during the process
+	 * finalization initiated from Tcl_Finalize()
+	 */
+
 	pthread_key_delete(key);
     }
 }