summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordavygrvy <davygrvy@pobox.com>2004-05-06 01:02:58 (GMT)
committerdavygrvy <davygrvy@pobox.com>2004-05-06 01:02:58 (GMT)
commit84a75075141136a76e5f65c8e3c322704de6b830 (patch)
tree8be2eee4339ed42785159834b5069e9f59dc7f0f /win
parent67c13e8ce843ef9594171c0789af6bbce954ab5c (diff)
downloadtcl-84a75075141136a76e5f65c8e3c322704de6b830.zip
tcl-84a75075141136a76e5f65c8e3c322704de6b830.tar.gz
tcl-84a75075141136a76e5f65c8e3c322704de6b830.tar.bz2
* generic/tclInt.h:
* generic/tclThread.c: * generic/tclEvent.c: * unix/tclUnixThrd.c: * win/tclWinThrd.c: Provisions made so masterLock, initLock, allocLock and joinLock mutexes can be recovered during Tcl_Finalize.
Diffstat (limited to 'win')
-rw-r--r--win/tclWinThrd.c41
1 files changed, 36 insertions, 5 deletions
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index e09d327..558cee4 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinThrd.c,v 1.24.2.4 2004/04/23 07:17:39 davygrvy Exp $
+ * RCS: @(#) $Id: tclWinThrd.c,v 1.24.2.5 2004/05/06 01:03:14 davygrvy Exp $
*/
#include "tclWinInt.h"
@@ -44,6 +44,7 @@ static CRITICAL_SECTION initLock;
static CRITICAL_SECTION allocLock;
static Tcl_Mutex allocLockPtr = (Tcl_Mutex) &allocLock;
+static int allocOnce = 0;
#endif /* TCL_THREADS */
@@ -393,18 +394,48 @@ Tcl_Mutex *
Tcl_GetAllocMutex()
{
#ifdef TCL_THREADS
- static int once = 0;
-
- if (!once) {
+ if (!allocOnce) {
InitializeCriticalSection(&allocLock);
- once = 1;
+ allocOnce = 1;
}
return &allocLockPtr;
#else
return NULL;
#endif
}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclpFinalizeLock
+ *
+ * This procedure is used to destroy all private resources used in
+ * this file.
+ *
+ * Results:
+ * None.
+ *
+ * Side effects:
+ * Destroys everything private. TclpInitLock must be held
+ * entering this function.
+ *
+ *----------------------------------------------------------------------
+ */
+void
+TclFinalizeLock ()
+{
+ MASTER_LOCK;
+ DeleteCriticalSection(&joinLock);
+ DeleteCriticalSection(&masterLock);
+ init = 0;
+#ifdef TCL_THREADS
+ DeleteCriticalSection(&allocLock);
+ allocOnce = 0;
+#endif
+ /* Destroy the critical section that we are holding. */
+ DeleteCriticalSection(&initLock);
+}
#ifdef TCL_THREADS