Improvements to the logging that occurs on an antivirus I/O retry.

FossilOrigin-Name: ff0ff75c3559f5bbe29c73204cc8ff1cb80f42cb

diff --git a/manifest b/manifest
index 7953e791699e72150e71475e1af121867d5b838e..8789521b051f3e2bbcc7d2302824f7b40196919b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\santi-virus\sretry\slogic\sfor\sDeleteFile().\s\sInvoke\ssqlite3_log()\nfor\seach\santi-virus\sretry.\s\sMake\sthe\sretry\sdelay\sconfigurable\sat\ncompile-time.
-D 2011-07-12T11:04:18.838
+C Improvements\sto\sthe\slogging\sthat\soccurs\son\san\santivirus\sI/O\sretry.
+D 2011-07-12T13:51:05.210
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -166,7 +166,7 @@ F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c d3e7b17100704ee0fe2ef71a98c478b947480f4d
-F src/os_win.c 4cea89f0a6c98b6a7f4fb3895544af8a07d7807d
+F src/os_win.c 07050df9e4956f8a8bb8983788b2523fd6e7db87
 F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
@@ -911,7 +911,7 @@ F test/where9.test 24f19ad14bb1b831564ced5273e681e495662848
 F test/whereA.test 24c234263c8fe358f079d5e57d884fb569d2da0a
 F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
 F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
-F test/win32lock.test 7fa3287dccc836fcaa8e0d1e77aa017de5889231
+F test/win32lock.test 58d2505e035a8175c2db524e58e7c5c9bf1a926c
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F tool/build-shell.sh 12aa4391073a777fcb6dcc490b219a018ae98bac
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@ -952,7 +952,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-P 03af4c175c6ba303ec0a5be25fd42771e38f7347
-R b94301e8087eadceda58922babc3618f
+P 89f1848d7f7d98b4f7da9218f99ed90d22dd43a8
+R 060b096970846ad68ec6f99f0023cc33
 U drh
-Z 71facc3c10c90f54a5e699820f127261
+Z 9da4b869d45a82433907baf19d8c1435

diff --git a/manifest.uuid b/manifest.uuid
index ccdb128bfa6bc956bdb374c00dde36b954771a67..2d27522bef2cd643c62c9c5c0808e44408964db6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-89f1848d7f7d98b4f7da9218f99ed90d22dd43a8
\ No newline at end of file
+ff0ff75c3559f5bbe29c73204cc8ff1cb80f42cb
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index f0cef153593d32eff9c1fcfbf6f07b7383c2ca94..cf2d57268228957eb438e81e834a03a90133169e 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -427,16 +427,25 @@ static int retryIoerr(int *pnRetry){
   }
   e = GetLastError();
   if( e==ERROR_LOCK_VIOLATION || e==ERROR_SHARING_VIOLATION ){
-    int delay = SQLITE_WIN32_IOERR_RETRY_DELAY*(1+*pnRetry);
-    sqlite3_log(SQLITE_IOERR, "delay %dms for lock/sharing violation - "
-                              "probably due to antivirus software", delay);
-    Sleep(delay);
+    Sleep(SQLITE_WIN32_IOERR_RETRY_DELAY*(1+*pnRetry));
     ++*pnRetry;
     return 1;
   }
   return 0;
 }
 
+/*
+** Log a I/O error retry episode.
+*/
+static void logIoerr(int nRetry){
+  if( nRetry ){
+    sqlite3_log(SQLITE_IOERR, 
+      "delayed %dms for lock/sharing conflict",
+      SQLITE_WIN32_IOERR_RETRY_DELAY*nRetry*(nRetry+1)/2
+    );
+  }
+}
+
 #if SQLITE_OS_WINCE
 /*************************************************************************
 ** This section contains code for WinCE only.
@@ -869,6 +878,7 @@ static int winRead(
     pFile->lastErrno = GetLastError();
     return winLogError(SQLITE_IOERR_READ, "winRead", pFile->zPath);
   }
+  logIoerr(nRetry);
   if( nRead<(DWORD)amt ){
     /* Unread parts of the buffer must be zero-filled */
     memset(&((char*)pBuf)[nRead], 0, amt-nRead);
@@ -890,6 +900,7 @@ static int winWrite(
 ){
   int rc;                         /* True if error has occured, else false */
   winFile *pFile = (winFile*)id;  /* File handle */
+  int nRetry = 0;                 /* Number of retries */
 
   assert( amt>0 );
   assert( pFile );
@@ -903,7 +914,6 @@ static int winWrite(
     u8 *aRem = (u8 *)pBuf;        /* Data yet to be written */
     int nRem = amt;               /* Number of bytes yet to be written */
     DWORD nWrite;                 /* Bytes written by each WriteFile() call */
-    int nRetry = 0;               /* Number of retries */
 
     while( nRem>0 ){
       if( !WriteFile(pFile->h, aRem, nRem, &nWrite, 0) ){
@@ -926,6 +936,8 @@ static int winWrite(
       return SQLITE_FULL;
     }
     return winLogError(SQLITE_IOERR_WRITE, "winWrite", pFile->zPath);
+  }else{
+    logIoerr(nRetry);
   }
   return SQLITE_OK;
 }
@@ -2386,7 +2398,11 @@ static int winDelete(
     while( (rc = DeleteFileW(zConverted))!=0 || retryIoerr(&cnt) ){}
 #endif
   }
-  if( rc ) rc = winLogError(SQLITE_IOERR_DELETE, "winDelete", zFilename);
+  if( rc ){
+    rc = winLogError(SQLITE_IOERR_DELETE, "winDelete", zFilename);
+  }else{
+    logIoerr(cnt);
+  }
   free(zConverted);
   OSTRACE(("DELETE \"%s\" %s\n", zFilename, (rc ? "failed" : "ok" )));
   return rc;

diff --git a/test/win32lock.test b/test/win32lock.test
index a45712d1736adbb2056d1f642f05a9fa618a2841..0fc88eb3f74e7482c8a026a33037ad0106834e34 100644 (file)
--- a/test/win32lock.test
+++ b/test/win32lock.test
@@ -20,6 +20,14 @@ source $testdir/tester.tcl
 
 set testprefix win32lock
 
+db close
+sqlite3_shutdown
+test_sqlite3_log xLog
+proc xLog {error_code msg} {
+  lappend ::log $msg 
+}
+sqlite3 db test.db
+
 do_test win32lock-1.1 {
   db eval {
     PRAGMA cache_size=10;
@@ -49,9 +57,18 @@ while {1} {
     do_test win32lock-1.2-$delay1 {
        set ::msg
     } {1 100000 2 50000 3 25000 4 12500}
+    if {$::log!=""} {
+      do_test win32lock-1.2-$delay1-log1 {
+        regsub {\d+} $::log # x
+        set x
+      } {{delayed #ms for lock/sharing conflict}}
+    }
     incr delay1 50
   }
+  set ::log {}
 }
 sqlite3_test_control_pending_byte $old_pending_byte
-
+sqlite3_shutdown
+test_sqlite3_log 
+sqlite3_initialize
 finish_test