From: mistachkin <mistachkin@noemail.net>
Date: Tue, 22 Apr 2014 19:34:16 +0000 (+0000)
Subject: Add some OSTRACE calls for consistency.
X-Git-Tag: version-3.8.5~51^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9df245b07385378bb7d9054e5f722ec7c283946b;p=thirdparty%2Fsqlite.git

Add some OSTRACE calls for consistency.

FossilOrigin-Name: be292d559748a24ff012266a1f58ce6c027e0411
---

diff --git a/manifest b/manifest
index 9f24411d5f..cea8c644a2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\swin32-none\sVFS\swhich\somits\srollback-journal\slocking.
-D 2014-04-22T19:30:00.797
+C Add\ssome\sOSTRACE\scalls\sfor\sconsistency.
+D 2014-04-22T19:34:16.263
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -204,7 +204,7 @@ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
-F src/os_win.c a49ee67a07d7aff98bd9793e7ac8c68ee12712b4
+F src/os_win.c 8c74fd4c2a7e2478e0b05530a51af4049acfcc43
 F src/pager.c ab62a24218d87dda1be641f6c5ad291bff78fd94
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
@@ -1161,10 +1161,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 65d2544af9adc1e2f1d193e57f8be0422fb0d5eb
-R a9779ff2bb2c9843026c8b0117f1fe75
-T *branch * win32-none
-T *sym-win32-none *
-T -sym-trunk *
-U drh
-Z d17256f50e94b0475de531ab714c2ce7
+P 03e3c5a8b17a219a49bfbe79b7debd27ace8ad85
+R 173fb04236ec33d12e5d272efbb7cda6
+U mistachkin
+Z 7e8fdfc3e14c55c25e98572df7e0ac54
diff --git a/manifest.uuid b/manifest.uuid
index 0a5654bde9..7c3c02fbb8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-03e3c5a8b17a219a49bfbe79b7debd27ace8ad85
\ No newline at end of file
+be292d559748a24ff012266a1f58ce6c027e0411
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 6b22fab20a..7d1b1af92a 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -2861,6 +2861,7 @@ static int winLock(sqlite3_file *id, int locktype){
   OSTRACE(("LOCK file=%p, oldLock=%d(%d), newLock=%d\n",
            pFile->h, pFile->locktype, pFile->sharedLockByte, locktype));
   if( pFile->ctrlFlags & WINFILE_NOLOCK ){
+    OSTRACE(("LOCK-NOP file=%p, rc=SQLITE_OK\n", pFile->h));
     return SQLITE_OK;
   }
 
@@ -2992,6 +2993,7 @@ static int winCheckReservedLock(sqlite3_file *id, int *pResOut){
   assert( id!=0 );
   if( pFile->ctrlFlags & WINFILE_NOLOCK ){
     rc = 0;
+    OSTRACE(("TEST-WR-LOCK file=%p, rc=%d (nop)\n", pFile->h, rc));
   }else if( pFile->locktype>=RESERVED_LOCK ){
     rc = 1;
     OSTRACE(("TEST-WR-LOCK file=%p, rc=%d (local)\n", pFile->h, rc));
@@ -3029,6 +3031,7 @@ static int winUnlock(sqlite3_file *id, int locktype){
   OSTRACE(("UNLOCK file=%p, oldLock=%d(%d), newLock=%d\n",
            pFile->h, pFile->locktype, pFile->sharedLockByte, locktype));
   if( pFile->ctrlFlags & WINFILE_NOLOCK ){
+    OSTRACE(("UNLOCK-NOP file=%p, rc=SQLITE_OK\n", pFile->h));
     return SQLITE_OK;
   }
   type = pFile->locktype;