From: drh <drh@noemail.net>
Date: Tue, 18 Jan 2011 16:13:27 +0000 (+0000)
Subject: Get all test cases working with the mutex-free-pcache implementation.
X-Git-Tag: version-3.7.5~27^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=986d3b95bb201a125d7343dfafa1d57472fd56f4;p=thirdparty%2Fsqlite.git

Get all test cases working with the mutex-free-pcache implementation.

FossilOrigin-Name: 2dc98d29995bef51108e99aa8f7a56427cf9e1d7
---

diff --git a/manifest b/manifest
index 631c49db4e..1f5d0773e5 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Do\snot\suse\sSQLITE_MUTEX_STATIC_MEM2\ssince\sit\shas\sbeen\sreused\sas\sSTATIC_OPEN.\nInstead,\screate\sa\snew\sstatic\smutex\sSTATIC_PMEM\swhich\sis\san\salias\sfor\sthe\nunused\sSTATIC_LRU2.
-D 2011-01-18T15:17:57.523
+C Get\sall\stest\scases\sworking\swith\sthe\smutex-free-pcache\simplementation.
+D 2011-01-18T16:13:27.224
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -556,7 +556,7 @@ F test/malloc_common.tcl 27087a2bfad8f695ca6f8b463ecac5d71b9b0712
 F test/manydb.test b3d3bc4c25657e7f68d157f031eb4db7b3df0d3c
 F test/memdb.test 0825155b2290e900264daaaf0334b6dfe69ea498
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
-F test/memsubsys1.test 4cbec6f202c91504bfc4717bfc2ffd6160316c4c
+F test/memsubsys1.test 66bf4e153e0eccc08c3b6af3641eb4f42d391c32
 F test/memsubsys2.test 72a731225997ad5e8df89fdbeae9224616b6aecc
 F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
@@ -570,7 +570,7 @@ F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
 F test/misc7.test 29032efcd3d826fbd409e2a7af873e7939f4a4e3
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
 F test/multiplex.test 92a4839213fd8cba8b59f86d42b7a1da1857db39
-F test/mutex1.test 5b71777fc127509cd257910c8db799de557a02de
+F test/mutex1.test 2fe5d592763e1aad6612b59fd862c8b1b0e0304b
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test a44e04df1486fcfb02d32468cbcd3c8e1e433723
 F test/notify1.test 8433bc74bd952fb8a6e3f8d7a4c2b28dfd69e310
@@ -586,7 +586,7 @@ F test/pagerfault.test 9de4d3e0c59970b4c6cb8dac511fa242f335d8a7
 F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
 F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
-F test/pcache.test 4118a183908ecaed343a06fcef3ba82e87e0129d
+F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
 F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
 F test/permutations.test c0ce0f3b741dd92a6d4c2671dbacba4b92dd81eb
 F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
@@ -899,14 +899,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P d094a1bfb7569a52b637fe9ba5d3fa6ce5ea6d94
-R 5a6f30062ab18eb4f0689f1eb22606f0
+P f1cf02efcb3a871fef49f8b5f41bcf07622a6d29
+R ae7dd673c03c5cec18f064cfaf72f5a8
 U drh
-Z 4ecccd4a56daba874bbeeabc61f35710
+Z 361d8d6f88c7d70dfbc961880b2d5a3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFNNa8poxKgR168RlERApBYAJ0f/N4hkLyYC7T/pc8MNg5yYDKMUgCfTraD
-26V7hw0ncBtQ25UIXFz1wYg=
-=AgYe
+iD8DBQFNNbwqoxKgR168RlERAkwpAJ98UXBjNfDigdVNfL5U73DQ1Ji1XACfaeFe
+sRz6NboclM0T0HvSkCmQEPs=
+=DkPe
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 1b84a37735..f27c91d65c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f1cf02efcb3a871fef49f8b5f41bcf07622a6d29
\ No newline at end of file
+2dc98d29995bef51108e99aa8f7a56427cf9e1d7
\ No newline at end of file
diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index c24a8bf95d..eb2512631b 100644
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -96,9 +96,10 @@ sqlite3_initialize
 reset_highwater_marks
 build_test_db memsubsys1-2 {PRAGMA page_size=1024}
 #show_memstats
+set MEMORY_MANAGEMENT $sqlite_options(memorymanage)
 do_test memsubsys1-2.3 {
   set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
-} [expr ($AUTOVACUUM+$TEMP_STORE>=2)*1024]
+} [expr ($AUTOVACUUM+$TEMP_STORE+$MEMORY_MANAGEMENT>=3)*1024]
 do_test memsubsys1-2.4 {
   set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
 } 20
diff --git a/test/mutex1.test b/test/mutex1.test
index ad6bd1470b..e2f7c89fb3 100644
--- a/test/mutex1.test
+++ b/test/mutex1.test
@@ -120,7 +120,9 @@ ifcapable threadsafe&&shared_cache {
         INSERT INTO abc VALUES(1, 2, 3);
       }
     } {}
-  
+    ifcapable !memorymanage {
+      regsub { static_lru} $mutexes {} mutexes
+    }
     do_test mutex1.2.$mode.3 {
       mutex_counters counters
   
diff --git a/test/pcache.test b/test/pcache.test
index e2bcd51319..5dc3059c44 100644
--- a/test/pcache.test
+++ b/test/pcache.test
@@ -21,6 +21,14 @@ source $testdir/tester.tcl
 #
 do_not_use_codec
 
+# Only works with a mode-2 pcache where all pcaches share a single set
+# of pages.
+#
+ifcapable {!memorymanage && threadsafe} {
+  finish_test
+  return
+}
+
 # The pcache module limits the number of pages available to purgeable
 # caches to the sum of the 'cache_size' values for the set of open
 # caches. This block of tests, pcache-1.*, test that the library behaves