summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixThrd.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-10-11 21:52:57 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-10-11 21:52:57 (GMT)
commit1ad6b91e705f65b9d156c10aa41c4a88e6686877 (patch)
tree4a830dcdd04884ee7552dabfd033c6428ec70f0f /unix/tclUnixThrd.c
parent012c80fc04ac184c1e045362d3cf6c3a6366d05e (diff)
parentde46d7767eadf5c2cdf992a3abd1413e15662674 (diff)
downloadtcl-1ad6b91e705f65b9d156c10aa41c4a88e6686877.zip
tcl-1ad6b91e705f65b9d156c10aa41c4a88e6686877.tar.gz
tcl-1ad6b91e705f65b9d156c10aa41c4a88e6686877.tar.bz2
Fix [3cc1d91345]: duplicate calls to TclpFreeAllocCache() on thread exists
Diffstat (limited to 'unix/tclUnixThrd.c')
-rw-r--r--unix/tclUnixThrd.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
index 8f8eb7f..7394545 100644
--- a/unix/tclUnixThrd.c
+++ b/unix/tclUnixThrd.c
@@ -712,7 +712,7 @@ void
TclpInitAllocCache(void)
{
pthread_mutex_lock(allocLockPtr);
- pthread_key_create(&key, TclpFreeAllocCache);
+ pthread_key_create(&key, NULL);
pthread_mutex_unlock(allocLockPtr);
}
@@ -722,13 +722,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);
}
}