Add some asserts to the Win32 mutex subsystem.

FossilOrigin-Name: e8f2dc5fadae96252649875c234fcdef1108bd48

diff --git a/manifest b/manifest
index dd136942c20e6093a6f3dcb4b7d65a326cb680de..04cafa52278f79102ef31291a35efd5a27d849f8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sbuild\son\swindows.
-D 2014-07-29T00:23:08.770
+C Add\ssome\sasserts\sto\sthe\sWin32\smutex\ssubsystem.
+D 2014-07-29T00:42:39.711
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -201,7 +201,7 @@ F src/mutex.c 84a073c9a23a8d7bdd2ea832522d1730df18812c
 F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
 F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1
 F src/mutex_unix.c 1b10d5413dfc794364a8adf3eb3a192926b43fa3
-F src/mutex_w32.c 13a6b8a3902f3750a3f251ee6640d983e7ca4d29
+F src/mutex_w32.c 92e8ead41598a289c93ac64dfd5e78820c4dabc1
 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
@@ -1189,7 +1189,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f2407a40f339fa6c2cec194f78ae7c93655b1ec1
-R bc66c7b33352e0660fc93d07e7c8b3a0
-U drh
-Z c1a505884ff19c661f20155161198823
+P 2773a5f9879a106a89a3d0bc3c5bfdcb2fe43c7c
+R 9e10c19fd0ddd3066b284eac0abe3eac
+U mistachkin
+Z 477d633de18b2c200b7eed3df7c1c412

diff --git a/manifest.uuid b/manifest.uuid
index 2e59c45d3ed1642ba7bebae27c9d981e008cbb13..7bff472a409c539db5e37d88d7b2cbc153d8f627 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2773a5f9879a106a89a3d0bc3c5bfdcb2fe43c7c
\ No newline at end of file
+e8f2dc5fadae96252649875c234fcdef1108bd48
\ No newline at end of file

diff --git a/src/mutex_w32.c b/src/mutex_w32.c
index 1f5775ccec91993c79d762efa797ec1f0f4ce844..78d1a6fba4e28175f4af43d63032e24c9d1d1db4 100644 (file)
--- a/src/mutex_w32.c
+++ b/src/mutex_w32.c
@@ -245,6 +245,7 @@ static void winMutexFree(sqlite3_mutex *p){
   assert( p );
   assert( p->nRef==0 && p->owner==0 );
   assert( p->id==SQLITE_MUTEX_FAST || p->id==SQLITE_MUTEX_RECURSIVE );
+  assert( winMutex_isInit==1 );
   DeleteCriticalSection(&p->mutex);
   sqlite3_free(p);
 }
@@ -265,6 +266,7 @@ static void winMutexEnter(sqlite3_mutex *p){
   DWORD tid = GetCurrentThreadId(); 
   assert( p->id==SQLITE_MUTEX_RECURSIVE || winMutexNotheld2(p, tid) );
 #endif
+  assert( winMutex_isInit==1 );
   EnterCriticalSection(&p->mutex);
 #ifdef SQLITE_DEBUG
   assert( p->nRef>0 || p->owner==0 );
@@ -293,6 +295,7 @@ static int winMutexTry(sqlite3_mutex *p){
   ** ticket #2685.
   */
 #if 0
+  assert( winMutex_isInit==1 );
   if( mutexIsNT() && TryEnterCriticalSection(&p->mutex) ){
     p->owner = tid;
     p->nRef++;
@@ -324,6 +327,7 @@ static void winMutexLeave(sqlite3_mutex *p){
   if( p->nRef==0 ) p->owner = 0;
   assert( p->nRef==0 || p->id==SQLITE_MUTEX_RECURSIVE );
 #endif
+  assert( winMutex_isInit==1 );
   LeaveCriticalSection(&p->mutex);
 #ifdef SQLITE_DEBUG
   if( p->trace ){