summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--unix/tclUnixThrd.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index ee080ba..bdac40d 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -927,13 +927,16 @@ TclpFreeAllocMutex(mutex)
void TclpFreeAllocCache(ptr)
void *ptr;
{
- extern void TclFreeAllocCache(void *);
-
- TclFreeAllocCache(ptr);
- /*
- * Perform proper cleanup of things done in TclpGetAllocCache.
- */
- if (initialized) {
+ if (ptr != NULL) {
+ /*
+ * Called by the pthread lib when a thread exits
+ */
+ TclFreeAllocCache(ptr);
+ } else if (initialized) {
+ /*
+ * Called by us in TclFinalizeThreadAlloc() during
+ * the library finalization initiated from Tcl_Finalize()
+ */
pthread_key_delete(key);
initialized = 0;
}