summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavidg <davidg>2000-08-10 18:24:52 (GMT)
committerdavidg <davidg>2000-08-10 18:24:52 (GMT)
commitd08d0f08b1369fd7940a2fdf2537fb1c8b073fb3 (patch)
tree13c30321bf41da90d4516dbe9f79999ffd43bc61
parentb3101a3f591cf286e57e54062f2a836336018836 (diff)
downloadtcl-d08d0f08b1369fd7940a2fdf2537fb1c8b073fb3.zip
tcl-d08d0f08b1369fd7940a2fdf2537fb1c8b073fb3.tar.gz
tcl-d08d0f08b1369fd7940a2fdf2537fb1c8b073fb3.tar.bz2
2000-08-10 David Gravereaux <davygrvy@ajubasolutions.com>
* generic/tclObj.c: r1.15 accidentally changed a global mutex name tclObjMutex to ObjMutex. Put the correct name back.
-rw-r--r--generic/tclInt.h3
-rw-r--r--generic/tclObj.c30
2 files changed, 17 insertions, 16 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h
index b8571ee..bb3e32d 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclInt.h,v 1.48 2000/07/22 01:53:24 ericm Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.49 2000/08/10 18:25:15 davidg Exp $
*/
#ifndef _TCLINT
@@ -2121,6 +2121,7 @@ EXTERN int TclCompileWhileCmd _ANSI_ARGS_((Tcl_Interp *interp,
#else /* not TCL_MEM_DEBUG */
#ifdef TCL_THREADS
+/* declared in tclObj.c */
extern Tcl_Mutex tclObjMutex;
#endif
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 3d1575f..d5d3821 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -1,5 +1,5 @@
/*
- * Obj.c --
+ * tclObj.c --
*
* This file contains Tcl object-related procedures that are used by
* many Tcl commands.
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclObj.c,v 1.17 2000/07/22 01:53:25 ericm Exp $
+ * RCS: @(#) $Id: tclObj.c,v 1.18 2000/08/10 18:24:52 davidg Exp $
*/
#include "tclInt.h"
@@ -36,7 +36,7 @@ Tcl_Obj *tclFreeObjList = NULL;
*/
#ifdef TCL_THREADS
-Tcl_Mutex ObjMutex;
+Tcl_Mutex tclObjMutex;
#endif
/*
@@ -167,7 +167,7 @@ TclInitObjSubsystem()
Tcl_RegisterObjType(&tclProcBodyType);
#ifdef TCL_COMPILE_STATS
- Tcl_MutexLock(&ObjMutex);
+ Tcl_MutexLock(&tclObjMutex);
ObjsAlloced = 0;
ObjsFreed = 0;
{
@@ -176,7 +176,7 @@ TclInitObjSubsystem()
ObjsShared[i] = 0;
}
}
- Tcl_MutexUnlock(&ObjMutex);
+ Tcl_MutexUnlock(&tclObjMutex);
#endif
}
@@ -207,9 +207,9 @@ TclFinalizeCompExecEnv()
typeTableInitialized = 0;
}
Tcl_MutexUnlock(&tableMutex);
- Tcl_MutexLock(&ObjMutex);
+ Tcl_MutexLock(&tclObjMutex);
tclFreeObjList = NULL;
- Tcl_MutexUnlock(&ObjMutex);
+ Tcl_MutexUnlock(&tclObjMutex);
TclFinalizeCompilation();
TclFinalizeExecution();
@@ -441,7 +441,7 @@ Tcl_NewObj()
* we maintain.
*/
- Tcl_MutexLock(&ObjMutex);
+ Tcl_MutexLock(&tclObjMutex);
if (tclFreeObjList == NULL) {
TclAllocateFreeObjects();
}
@@ -455,7 +455,7 @@ Tcl_NewObj()
#ifdef TCL_COMPILE_STATS
ObjsAlloced++;
#endif /* TCL_COMPILE_STATS */
- Tcl_MutexUnlock(&ObjMutex);
+ Tcl_MutexUnlock(&tclObjMutex);
return objPtr;
}
#endif /* TCL_MEM_DEBUG */
@@ -510,9 +510,9 @@ Tcl_DbNewObj(file, line)
objPtr->length = 0;
objPtr->typePtr = NULL;
#ifdef TCL_COMPILE_STATS
- Tcl_MutexLock(&ObjMutex);
+ Tcl_MutexLock(&tclObjMutex);
ObjsAlloced++;
- Tcl_MutexUnlock(&ObjMutex);
+ Tcl_MutexUnlock(&tclObjMutex);
#endif /* TCL_COMPILE_STATS */
return objPtr;
}
@@ -626,7 +626,7 @@ TclFreeObj(objPtr)
* Tcl_Obj structs we maintain.
*/
- Tcl_MutexLock(&ObjMutex);
+ Tcl_MutexLock(&tclObjMutex);
#ifdef TCL_MEM_DEBUG
ckfree((char *) objPtr);
#else
@@ -637,7 +637,7 @@ TclFreeObj(objPtr)
#ifdef TCL_COMPILE_STATS
ObjsFreed++;
#endif /* TCL_COMPILE_STATS */
- Tcl_MutexUnlock(&ObjMutex);
+ Tcl_MutexUnlock(&tclObjMutex);
}
/*
@@ -2112,7 +2112,7 @@ Tcl_DbIsShared(objPtr, file, line)
}
#endif
#ifdef TCL_COMPILE_STATS
- Tcl_MutexLock(&ObjMutex);
+ Tcl_MutexLock(&tclObjMutex);
if ((objPtr)->refCount <= 1) {
ObjsShared[1]++;
} else if ((objPtr)->refCount < TCL_MAX_SHARED_OBJ_STATS) {
@@ -2120,7 +2120,7 @@ Tcl_DbIsShared(objPtr, file, line)
} else {
ObjsShared[0]++;
}
- Tcl_MutexUnlock(&ObjMutex);
+ Tcl_MutexUnlock(&tclObjMutex);
#endif
return ((objPtr)->refCount > 1);
}