The iInUseDB and iInUseMM variables do not need to be volatile.

FossilOrigin-Name: bb18f5785283e1067338b6b85098e8f2ff3b093a

diff --git a/manifest b/manifest
index 522a2abc1e37aded65610149e833f69653f4cc6c..ee9d64588eb319300c4e0e04dd9d5e750fba03e5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Always\shold\sthe\sMEM2\smutex\swhen\sinitially\smarking\sa\spager\sas\sin\suse\sby\sits\ndatabase\sconnection.
-D 2010-01-30T22:28:47
+C The\siInUseDB\sand\siInUseMM\svariables\sdo\snot\sneed\sto\sbe\svolatile.
+D 2010-01-30T23:08:24
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 79aeba12300a54903f1b1257c1e7c190234045dd
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -124,7 +124,7 @@ F src/os_common.h e8b748b2f2ecc8a498e50bfe5d8721f189c19d2a
 F src/os_os2.c 0c3a5802bc4fdb7cb5f66771552b081c4e48a216
 F src/os_unix.c a810e2aefdaddacf479407f76f8f4ca381d231b2
 F src/os_win.c 3a60bddd07ea6f8adb2314dd5996ac97b988f403
-F src/pager.c 1f77fc8d4ca6c8119c46e578c6595b8bc58b2966
+F src/pager.c 8e6b147f46c80fe31ee4d202d2478f461aa7ce18
 F src/pager.h 4f051fd856de6fd3c19aef5f82eace54122b9173
 F src/parse.y fc4bd35c6088901f7c8daead26c6fb11c87d22e7
 F src/pragma.c 2e4bb2e76e48a32750529fdc4bfe86ac5f54e01b
@@ -637,14 +637,14 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P a718e6634795a48b5dd5c08833ab561e6381a62d
-R ede77834150c4686fbce83c90fb93739
+P 622c17177af6851fec11bdec8fb6246c13135b2f
+R e9eaccaf9f16fa14643ac18463a7e091
 U drh
-Z 271b73fa90b6232af1206fcf2703ce9e
+Z ba00ac2997800f42b378226025ca0d50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLZLKioxKgR168RlERArSqAJ0ZqE31rSrzcJl/uPoUKXMfOlFjNQCfVJZ0
-xM3NDDmzfB5aB8fx/vE9XOk=
-=vAb3
+iD8DBQFLZLvqoxKgR168RlERAizUAJ9Di56YC1Zc+ZRYvDwFKYstmzdmgACdGglw
+1AHQmR5SOB5iTAk/+APTz0g=
+=9KoF
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 52f37c1238f8741655dd45de3d90d6be58eecb8b..19e5fbbae0697cfadbc803673aa1fc384069a188 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-622c17177af6851fec11bdec8fb6246c13135b2f
\ No newline at end of file
+bb18f5785283e1067338b6b85098e8f2ff3b093a
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 5b186e02b51c30522282feef932828a29f6f4b0e..7df2dc79543a6466c76d3ba78032d0cddd16a4dc 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -401,8 +401,8 @@ struct Pager {
 #ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
   Pager *pNext;               /* Doubly linked list of pagers on which */
   Pager *pPrev;               /* sqlite3_release_memory() will work */
-  volatile int iInUseMM;      /* Non-zero if unavailable to MM */
-  volatile int iInUseDB;      /* Non-zero if in sqlite3_release_memory() */
+  int iInUseDB;               /* Non-zero if in sqlite3_release_memory() */
+  u8 iInUseMM;                /* Non-zero if unavailable to MM */
   u8 onPagerList;             /* True if part of the sqlite3PagerList */
 #endif
   char *pTmpSpace;            /* Pager.pageSize bytes of space for tmp use */