* generic/tclLiteral.c (TclGlobalLiteralTable): add a thread exit

	handler to remove remaining literals on thread exit.

2 files changed, 40 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0f8c609..7ab94fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-11-26  Jeff Hobbs  <jeffh@ActiveState.com>
 
+	* tests/__clone.test: rename to allow it to be lexically first.
+
+	* generic/tclLiteral.c (TclGlobalLiteralTable): add a thread exit
+	handler to remove remaining literals on thread exit.
+
 	* generic/tclMain.c (Tcl_Main):	added Tcl_DeleteInterp and
 	* unix/tclAppInit.c (main):	Tcl_Finalize in -DPURIFY case to
 					help indentify memory leaks.
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 4bb0930..e1d459b 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclLiteral.c,v 1.8.2.3.2.3 2002/11/26 19:48:57 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclLiteral.c,v 1.8.2.3.2.4 2002/11/26 20:15:00 hobbs Exp $
  */
 
 #include "tclInt.h"
@@ -64,6 +64,35 @@ static void		RebuildLiteralTable _ANSI_ARGS_((
 			    LiteralTable *tablePtr));
 
 #ifdef TCL_THREAD_LITERALS
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * LiteralThreadExitProc --
+ *
+ *	This function is call at exit or unload time to remove the
+ *	timer and idle event sources.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Removes the timer and idle event sources.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static void
+LiteralThreadExitProc(clientData)
+    ClientData clientData;
+{
+    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
+    if (tsdPtr->initialized) {
+	TclDeleteLiteralTable(NULL, &(tsdPtr->literalTable));
+	tsdPtr->initialized = 0;
+    }
+}
+
 /*
  *----------------------------------------------------------------------
  *
@@ -87,6 +116,7 @@ TclGlobalLiteralTable()
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
     if (!tsdPtr->initialized) {
 	TclInitLiteralTable(&(tsdPtr->literalTable));
+	Tcl_CreateThreadExitHandler(LiteralThreadExitProc, NULL);
 	tsdPtr->initialized = 1;
     }
     return &(tsdPtr->literalTable);
@@ -246,6 +276,9 @@ TclRegisterLiteral(envPtr, bytes, length, onHeap)
 #ifdef TCL_COMPILE_STATS
     ByteCodeStats *statsPtr = TclGlobalByteCodeStats();
 #endif
+#ifdef TCL_COMPILE_DEBUG
+    Interp *iPtr = envPtr->iPtr;
+#endif
 #else
     Interp *iPtr = envPtr->iPtr;
     LiteralTable *globalTablePtr = &(iPtr->literalTable);
@@ -811,7 +844,7 @@ TclReleaseLiteral(interp, objPtr)
 		if (objPtr->typePtr == &tclByteCodeType) {
 		    codePtr = ((ByteCode *) objPtr->internalRep.otherValuePtr)->bcDataPtr;
 		    if ((codePtr->numLitObjects == 1)
-		            && (codePtr->objArrayPtr[0] == objPtr)) {			
+		            && (codePtr->objArrayPtr[0] == objPtr)) {
 			codePtr->objArrayPtr[0] = NULL;
 		    }
 		}