Correctly record the fact that the SHM lock reached PENDING if it did so

but failed to reach CHECKPOINT.

FossilOrigin-Name: d9250e84ac1fc6590f8670e1d801630650c7846a

diff --git a/manifest b/manifest
index a8c76e2fb4419888aeb76f11dda7208170f26365..e197ab314fa3d87cb0abd409c69899e6bdf6e8a1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\sa\scouple\suninitialized\svariables\sin\sthe\sxShmLock\smethod\sof\sthe\sunix\sVFS.\nImproved\sdebugging\slogic\sfor\sxShmLock.
-D 2010-04-30T15:54:47
+C Correctly\srecord\sthe\sfact\sthat\sthe\sSHM\slock\sreached\sPENDING\sif\sit\sdid\sso\nbut\sfailed\sto\sreach\sCHECKPOINT.
+D 2010-04-30T16:12:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -224,7 +224,7 @@ F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c e4a52d13bff093bc446886cf7b0dfacbc7c2e8a4
+F src/wal.c f08889611d5da7d2cbe9557748e74f70ab454974
 F src/wal.h c3f347ba8f1cde46d9bcc6fedaf3ed0aa4b53294
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c faadd9c2bf08868e5135192b44e0d753e363a885
@@ -811,14 +811,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P c05e7dca172719f33e245c08d0c0e8ab47e5a537
-R 948b3a20fa291178488b4491978dd814
+P 69567c5fca9e30b7660e6f56350be929c3890d7e
+R f1e5ca7c2966e55a12226da1f0023970
 U drh
-Z 0b83af1d29a8669f0e45a2c764ca0612
+Z 994a305fc2d5c733b714331360471304
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFL2v1KoxKgR168RlERAtTvAJ9anChtmXUlkLMCUv41sdV2i+tOhgCfd+Pd
-kBX8Xzf3zeWR2SKzYU3eb8s=
-=dWTT
+iD8DBQFL2wFboxKgR168RlERAtivAJ421LoVOiKR0QgB26iqLm0H6jPUVQCfaTeL
+mXtGX6pDDXUBVGxSGpeJW2k=
+=Sf6+
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 021b3496c35eb9b79dac036294f40667705a58c6..39d508f3226a9d3bc550b413c2552e29f087f236 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-69567c5fca9e30b7660e6f56350be929c3890d7e
\ No newline at end of file
+d9250e84ac1fc6590f8670e1d801630650c7846a
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index 0942a53f78fa110262c00820fd3647129a11e058..2925023e7187c02b90994758bb3e56a8e89a776a 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -217,11 +217,10 @@ static int walSetLock(Wal *pWal, int desiredStatus){
   int rc, got;
   if( pWal->lockState==desiredStatus ) return SQLITE_OK;
   rc = pWal->pVfs->xShmLock(pWal->pWIndex, desiredStatus, &got);
-  if( rc==SQLITE_OK ){
-    pWal->lockState = desiredStatus;
-    if( desiredStatus==SQLITE_SHM_READ ){
-      pWal->readerType = got;
-    }
+  pWal->lockState = got;
+  if( got==SQLITE_SHM_READ_FULL || got==SQLITE_SHM_READ ){
+    pWal->readerType = got;
+    pWal->lockState = SQLITE_SHM_READ;
   }
   return rc;
 }
@@ -785,35 +784,8 @@ int sqlite3WalClose(
 ){
   int rc = SQLITE_OK;
   if( pWal ){
-    int isDelete = 0;             /* True to unlink wal and wal-index files */
-
-    /* If an EXCLUSIVE lock can be obtained on the database file (using the
-    ** ordinary, rollback-mode locking methods, this guarantees that the
-    ** connection associated with this log file is the only connection to
-    ** the database. In this case checkpoint the database and unlink both
-    ** the wal and wal-index files.
-    **
-    ** The EXCLUSIVE lock is not released before returning.
-    */
-    rc = sqlite3OsLock(pFd, SQLITE_LOCK_EXCLUSIVE);
-    if( rc==SQLITE_OK ){
-      rc = walCheckpoint(pWal, pFd, sync_flags, zBuf);
-      if( rc==SQLITE_OK ){
-        isDelete = 1;
-      }
-      walIndexUnmap(pWal);
-    }
-
     pWal->pVfs->xShmClose(pWal->pWIndex);
     sqlite3OsClose(pWal->pFd);
-    if( isDelete ){
-      int nWal;
-      char *zWal = &((char *)pWal->pFd)[pWal->pVfs->szOsFile];
-      sqlite3OsDelete(pWal->pVfs, zWal, 0);
-      nWal = sqlite3Strlen30(zWal);
-      memcpy(&zWal[nWal], "-index", 7);
-      pWal->pVfs->xShmDelete(pWal->pVfs, zWal);
-    }
     sqlite3_free(pWal);
   }
   return rc;
@@ -1036,24 +1008,6 @@ int sqlite3WalWriteLock(Wal *pWal, int op){
   if( op ){
     assert( pWal->lockState == SQLITE_SHM_READ );
     rc = walSetLock(pWal, SQLITE_SHM_WRITE);
-
-    /* If this connection is not reading the most recent database snapshot,
-    ** it is not possible to write to the database. In this case release
-    ** the write locks and return SQLITE_BUSY.
-    */
-    if( rc==SQLITE_OK ){
-      rc = walIndexMap(pWal, -1);
-      if( rc==SQLITE_OK 
-       && memcmp(&pWal->hdr, pWal->pWiData, sizeof(WalIndexHdr))
-      ){
-        rc = SQLITE_BUSY;
-      }
-      walIndexUnmap(pWal);
-      if( rc!=SQLITE_OK ){
-        walSetLock(pWal, SQLITE_SHM_READ);
-      }
-    }
-
   }else if( pWal->lockState==SQLITE_SHM_WRITE ){
     rc = walSetLock(pWal, SQLITE_SHM_READ);
   }