In test_mutex.c, zero the global structure staticly instead of in Sqlitetest_mutex_In...

FossilOrigin-Name: 8b318b9385d0542ca56750b901c0c6b7d05ca634

diff --git a/manifest b/manifest
index 7920f94325dfaf1d909788da279775b6d3fe1e9b..b15ef3abd4eef23cdd29701b61a900d9acf43db4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\sthe\s"onefile"\sdemo,\spass\sSQLITE_OPEN_TEMP_DB\sinstead\sof\sMAIN_DB\sto\sthe\sOS\slayer\swhen\sopening\sthe\ssingle\sfile.\sThis\sis\sto\swork\saround\sthe\sassert()\sin\sos_unix.c\sthat\stests\sthat\sthe\slocking\sregion\sis\snot\swritten\sto.\s(CVS\s6278)
-D 2009-02-10T18:54:03
+C In\stest_mutex.c,\szero\sthe\sglobal\sstructure\sstaticly\sinstead\sof\sin\sSqlitetest_mutex_Init().\sThis\sis\sbecause\sSqlitetest_mutex_Init()\sis\snow\scalled\sby\seach\sthread\sduring\sthread\stests\s((6193)).\sTest\scode\schanges\sonly.\s(CVS\s6279)
+D 2009-02-11T05:18:07
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -185,7 +185,7 @@ F src/test_journal.c 0f4b9a929fae2be5bee0230f29204227c3d76c71
 F src/test_loadext.c 97dc8800e46a46ed002c2968572656f37e9c0dd9
 F src/test_malloc.c d23050c7631ec9ee0369c7ca905e6c9233968e11
 F src/test_md5.c 032ae2bb6f81da350d2404e81fa8d560c8268026
-F src/test_mutex.c 5f772b1b9952e1e559e3d54e63bc7ec6f98fecd0
+F src/test_mutex.c 87d99bdad7fb5d9aa4b5c7cf42423cfbf56eba2c
 F src/test_onefile.c 1efd91e63ce3d92e8331bfed83854e2b4dcd2e72
 F src/test_osinst.c 9a70a61e127f9e72bcfca000b20368b1c5367873
 F src/test_pcache.c 29464896d9c67832e4eef916c0682b98d7283d00
@@ -701,7 +701,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P fafb07b83721d67f6c6f3126c8de94b9b7efa519
-R dccc9b0ed133be6dc34d807e0da6e75f
+P 2da076a2c1663e916dc50e5e1679be216922dfc5
+R 183a0bce67e12d80eb1e99f8c034c4cc
 U danielk1977
-Z a57c36962611913657436cc3cf209f37
+Z bd1c3b31b6fc6d323855e59951084116

diff --git a/manifest.uuid b/manifest.uuid
index cf6a55479295e3dafdce13f81501e6fb7b4c4de5..774527dd5387a2bc307a3c6462e03ecbb416c7cc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2da076a2c1663e916dc50e5e1679be216922dfc5
\ No newline at end of file
+8b318b9385d0542ca56750b901c0c6b7d05ca634
\ No newline at end of file

diff --git a/src/test_mutex.c b/src/test_mutex.c
index 8324803dbe151089f2b97201a201f567deafe7cc..2d0f719a63c57b7ecc2c68a6c19628fe8c6c59d3 100644 (file)
--- a/src/test_mutex.c
+++ b/src/test_mutex.c
@@ -10,7 +10,7 @@
 **
 *************************************************************************
 ** 
-** $Id: test_mutex.c,v 1.13 2009/01/19 17:40:12 drh Exp $
+** $Id: test_mutex.c,v 1.14 2009/02/11 05:18:07 danielk1977 Exp $
 */
 
 #include "tcl.h"
@@ -38,7 +38,7 @@ static struct test_mutex_globals {
   sqlite3_mutex_methods m;      /* Interface to "real" mutex system */
   int aCounter[8];              /* Number of grabs of each type of mutex */
   sqlite3_mutex aStatic[6];     /* The six static mutexes */
-} g;
+} g = {0};
 
 /* Return true if the countable mutex is currently held */
 static int counterMutexHeld(sqlite3_mutex *p){
@@ -431,7 +431,6 @@ int Sqlitetest_mutex_Init(Tcl_Interp *interp){
   for(i=0; i<sizeof(aCmd)/sizeof(aCmd[0]); i++){
     Tcl_CreateObjCommand(interp, aCmd[i].zName, aCmd[i].xProc, 0, 0);
   }
-  memset(&g, 0, sizeof(g));
 
   Tcl_LinkVar(interp, "disable_mutex_init", 
               (char*)&g.disableInit, TCL_LINK_INT);