From b15ae226b92170c6bdb640bf648891cfc177a956 Mon Sep 17 00:00:00 2001
From: ferrieux <ferrieux@users.sourceforge.net>
Date: Tue, 2 Sep 2014 21:57:20 +0000
Subject: Add test cases in very first position for hang-on-exit, both in
 (normal) quick-exit and TCL_FINALIZE_ON_EXIT=1 modes.

---
 tests/aaa_exit.test | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 tests/aaa_exit.test

diff --git a/tests/aaa_exit.test b/tests/aaa_exit.test
new file mode 100644
index 0000000..51a94d7
--- /dev/null
+++ b/tests/aaa_exit.test
@@ -0,0 +1,41 @@
+# Commands covered:  exit, emphasis on finalization hangs
+#
+# This file contains a collection of tests for one or more of the Tcl
+# built-in commands.  Sourcing this file into Tcl runs the tests and
+# generates output for errors.  No output means no errors were found.
+#
+# Copyright (c) 1991-1993 The Regents of the University of California.
+# Copyright (c) 1994-1997 Sun Microsystems, Inc.
+# Copyright (c) 1998-1999 by Scriptics Corporation.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    package require tcltest 2
+    namespace import -force ::tcltest::*
+}
+
+
+test exit-1.1 {normal, quick exit} {
+     set f [open "|[interpreter] << \"exec [interpreter] << {set ::env(TCL_FINALIZE_ON_EXIT) 0;exit}\" 2>@ stderr" r]
+     set aft [after 5000 {set done "Quick exit hangs !!!"}]
+     fileevent $f readable {after cancel $aft;set done OK}
+     vwait done
+     catch {fconfigure $f -blocking 0;close $f}
+     set done
+} OK
+
+test exit-1.2 {full-finalized exit} {
+     set f [open "|[interpreter] << \"exec [interpreter] << {set ::env(TCL_FINALIZE_ON_EXIT) 1;exit}\" 2>@ stderr" r]
+     set aft [after 5000 {set done "Full-finalized exit hangs !!!"}]
+     fileevent $f readable {after cancel $aft;set done OK}
+     vwait done
+     catch {fconfigure $f -blocking 0;close $f}
+     set done
+} OK
+
+
+# cleanup
+::tcltest::cleanupTests
+return
-- 
cgit v0.12


From a4a3d764f5bc4047858e2a14a54d26c55b1cf0c0 Mon Sep 17 00:00:00 2001
From: ferrieux <ferrieux@users.sourceforge.net>
Date: Tue, 2 Sep 2014 22:00:03 +0000
Subject: Refrain from calling TclFinalizeThreadData() in quick-exit case as it
 is useless (just memory freeing). Superficially fixes [Bug 132fad6f]; that
 bug is still exerciseable thanks to recent additions to the test suite that
 exercise full finalization.

---
 generic/tclEvent.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 941d566..ab219a6 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1299,18 +1299,20 @@ 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();
+    }
 }
 
 /*
-- 
cgit v0.12