Fix an inconsistent #ifdef in wal.c. Fix os_unix.c so that it does not allow

moving an SHM lock directly exclusive to shared without going through unlocked.

FossilOrigin-Name: 552658da2845c2323167b6c7db6e5c00090f280c

diff --git a/manifest b/manifest
index f604206892bf0b4ff4e4f5c479b015e6d86c9755..5fee26a775f72641b42a82a27e8db69a7f263a19 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Avoid\sdropping\sthe\scheckpoint\slock\safter\sa\srecovery\srun\sas\sa\sprecursor\sto\sa\scheckpoint\soperation.
-D 2010-05-31T16:41:54
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Fix\san\sinconsistent\s#ifdef\sin\swal.c.\s\sFix\sos_unix.c\sso\sthat\sit\sdoes\snot\sallow\nmoving\san\sSHM\slock\sdirectly\sexclusive\sto\sshared\swithout\sgoing\sthrough\sunlocked.
+D 2010-05-31T16:56:15
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -152,7 +155,7 @@ F src/os.c 1516984144e26734f97748f891f1a04f9e294c2e
 F src/os.h 6f604986f0ef0ca288c2330b16051ff70b431e8c
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
-F src/os_unix.c 833dbeae0072d4574801f29873594fc988ba3c3a
+F src/os_unix.c 18ed6016685593e23c0e559804dd391a030dfb62
 F src/os_win.c f815403c51a2adad30244374c801dd7fd2734567
 F src/pager.c f7128f02623beab9462ca6e73516cf73c49186f8
 F src/pager.h 76466c3a5af56943537f68b1f16567101a0cd1d0
@@ -224,7 +227,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 fa5f1784e9189531814dc67fa6461282592acb4b
+F src/wal.c 0ccac00186c45061315676b1a17f68ec181606a2
 F src/wal.h 1c1c9feb629b7f4afcbe0b47f80f47c5551d3a02
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
@@ -815,7 +818,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P db3509c55dfe288650b803622e3a0828c6e59aea
-R d089df4f4060e25697a3c07428a29882
-U dan
-Z 14dfbc0870be522424bf1d08866a3ca4
+P cc25cfa04630a43c1de26f2dbdacbe46c110a2b5
+R 12262d82072f7c372f85b91e7ec97bb1
+U drh
+Z b2a5a03b4797272b0d03b889e6006ebd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMA+oyoxKgR168RlERAv5qAJwI2G0xWyNj/habBep9Ebm7jU70XgCfTTIK
+D6l/MUB5JLrcq4YPmXmA4L0=
+=jHvO
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index e1dd6c62191c48b64629703d0906f20a36b82f0f..25ed1e0a2a029cb0589ab341903cc9b3c01c9fb5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cc25cfa04630a43c1de26f2dbdacbe46c110a2b5
\ No newline at end of file
+552658da2845c2323167b6c7db6e5c00090f280c
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 659e91f3bdf7fc34c20e79e2555907d27e93d1e5..91f641e05720996a299c0128b5fdba5ecb2f7d27 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3569,6 +3569,11 @@ static int unixShmRelease(sqlite3_file *fd){
 
 /*
 ** Change the lock state for a shared-memory segment.
+**
+** Note that the relationship between SHAREd and EXCLUSIVE locks is a little
+** different here than in posix.  In xShmLock(), one can go from unlocked
+** to shared and back or from unlocked to exclusive and back.  But one may
+** not go from shared to exclusive or from exclusive to shared.
 */
 static int unixShmLock(
   sqlite3_file *fd,          /* Database file holding the shared memory */
@@ -3626,7 +3631,6 @@ static int unixShmLock(
     ** SQLITE_BUSY.
     */
     for(pX=pShmNode->pFirst; pX; pX=pX->pNext){
-      if( pX==p ) continue;
       if( (pX->exclMask & mask)!=0 ){
         rc = SQLITE_BUSY;
         break;
@@ -3652,7 +3656,6 @@ static int unixShmLock(
     ** lock.  If any do, return SQLITE_BUSY right away.
     */
     for(pX=pShmNode->pFirst; pX; pX=pX->pNext){
-      if( pX==p ) continue;
       if( (pX->exclMask & mask)!=0 || (pX->sharedMask & mask)!=0 ){
         rc = SQLITE_BUSY;
         break;
@@ -3665,7 +3668,7 @@ static int unixShmLock(
     if( rc==SQLITE_OK ){
       rc = unixShmSystemLock(pShmNode, F_WRLCK, ofst+UNIX_SHM_BASE, n);
       if( rc==SQLITE_OK ){
-        p->sharedMask &= ~mask;
+        assert( (p->sharedMask & mask)==0 );
         p->exclMask |= mask;
       }
     }

diff --git a/src/wal.c b/src/wal.c
index 38b652f0a3a6de7b4645e8045d85388bcb08bef8..d57d4636c7e797cf7af3891a1f4db26796a61426 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -226,10 +226,8 @@
 /*
 ** Trace output macros
 */
-#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG)
-int sqlite3WalTrace = 0;
-#endif
 #if defined(SQLITE_TEST) && defined(SQLITE_DEBUG)
+int sqlite3WalTrace = 0;
 # define WALTRACE(X)  if(sqlite3WalTrace) sqlite3DebugPrintf X
 #else
 # define WALTRACE(X)