Refine TclFinalizeThreadData so that the quick-exit optimization really only affects exit.

2 files changed, 16 insertions, 14 deletions

diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index ab219a6..3985767 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1299,20 +1299,17 @@ Tcl_FinalizeThread(void)
 	TclFinalizeAsync();
 	TclFinalizeThreadObjects();
     }
-    if (TclFullFinalizationRequested()) { /* useless if we are facing a quick-exit */
 
-	/*
-	 * Blow away all thread local storage blocks.
-	 *
-	 * Note that Tcl API allows creation of threads which do not use any Tcl
-	 * interp or other Tcl subsytems. Those threads might, however, use thread
-	 * local storage, so we must unconditionally finalize it.
-	 *
-	 * Fix [Bug #571002]
-	 */
-	
-	TclFinalizeThreadData();
-    }
+    /*
+     * Blow away all thread local storage blocks.
+     *
+     * Note that Tcl API allows creation of threads which do not use any Tcl
+     * interp or other Tcl subsytems. Those threads might, however, use thread
+     * local storage, so we must unconditionally finalize it.
+     *
+     * Fix [Bug #571002]
+     */
+    TclFinalizeThreadData();
 }
 
 /*
diff --git a/generic/tclThread.c b/generic/tclThread.c
index 8c972a8..5ac6a8d 100644
--- a/generic/tclThread.c
+++ b/generic/tclThread.c
@@ -357,7 +357,12 @@ TclFinalizeThreadData(void)
 {
     TclFinalizeThreadDataThread();
 #if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
-    TclFinalizeThreadAllocThread();
+    if ((!TclInExit())||TclFullFinalizationRequested()) {
+	/*
+	 * Quick exit principle makes it useless to terminate allocators
+	 */
+	TclFinalizeThreadAllocThread();
+    }
 #endif
 }