Added assert to verify winMutex system is inited before "static" mutexes are used...

FossilOrigin-Name: b126013b5a1d6526810139d19acbec7fd0ab8168

diff --git a/manifest b/manifest
index 9b5add9e6da02c67dc7b3a7ec3e0d4d542884fe8..4896ad9cd9016564a2be52cc9ccdc7df33e4b2b6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\s"static"\smutexes\sare\sdeleted\son\sshutdown\sso\sthat\sthey\sare\snot\sleaked\sacross\srestarts.\s(CVS\s6700)
-D 2009-06-01T17:06:08
+C Added\sassert\sto\sverify\swinMutex\ssystem\sis\sinited\sbefore\s"static"\smutexes\sare\sused.\s(CVS\s6701)
+D 2009-06-01T17:10:22
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -138,7 +138,7 @@ F src/mutex.h 9e686e83a88838dac8b9c51271c651e833060f1e
 F src/mutex_noop.c f5a07671f25a1a9bd7c10ad7107bc2585446200f
 F src/mutex_os2.c 6b5a74f812082a8483c3df05b47bbaac2424b9a0
 F src/mutex_unix.c 2f936339dfef1a4c142db290d575a3509b77315f
-F src/mutex_w32.c 3dd7c4fd63546c4e1fe71a69a45ec37b74654843
+F src/mutex_w32.c cd611ebe0671a05e3d5b4e3f37032a45eb2ce612
 F src/notify.c 0127121816d8a861deb0dfd111b495346bf233db
 F src/os.c c2aa4a7d8bb845222e5c37f56cde377b20c3b087
 F src/os.h fa3f4aa0119ff721a2da4b47ffd74406ac864c05
@@ -731,7 +731,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 0791588520603d106aa0b8ce24d68b740b7b80c8
-R 8cd431ad0020e4aa3530ef419536d17a
+P 4e75897ee177bd24145f9dbfccd41a03c108440f
+R c9b75933dd204df4863fe45c2a3da85c
 U shane
-Z e7a4fe02802663fd359b8200de1cba6f
+Z 73868adefad3a7d624bd940507eb93ad

diff --git a/manifest.uuid b/manifest.uuid
index 31aaf47d88d79f2a7fbda3f496ad58ac2d90083f..7007bfd72d87f23b939107df079678a6390ef3b5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e75897ee177bd24145f9dbfccd41a03c108440f
\ No newline at end of file
+b126013b5a1d6526810139d19acbec7fd0ab8168
\ No newline at end of file

diff --git a/src/mutex_w32.c b/src/mutex_w32.c
index a7115b84cd5e7d66ba935dd1eb52dc186f89ce87..98e239e41cf3e4c04c194d2d91882501bbd030e3 100644 (file)
--- a/src/mutex_w32.c
+++ b/src/mutex_w32.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains the C functions that implement mutexes for win32
 **
-** $Id: mutex_w32.c,v 1.16 2009/06/01 17:06:08 shane Exp $
+** $Id: mutex_w32.c,v 1.17 2009/06/01 17:10:22 shane Exp $
 */
 #include "sqliteInt.h"
 
@@ -175,6 +175,7 @@ static sqlite3_mutex *winMutexAlloc(int iType){
       break;
     }
     default: {
+      assert( winMutex_isInit==1 );
       assert( iType-2 >= 0 );
       assert( iType-2 < sizeof(winMutex_staticMutexes)/sizeof(winMutex_staticMutexes[0]) );
       p = &winMutex_staticMutexes[iType-2];