Update mutex1.test so that it works with the memsubsys1 permutation (pagecache memory...

FossilOrigin-Name: 456bd5c63b41bae8e389df81e318b830aa314000

diff --git a/manifest b/manifest
index 341d671a0e62b17761da45fe9c9f1a1544139c15..ce3b4c2f720c12b532c9c49bf663f58359809180 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\sexclusive2.test\sto\smake\sit\smore\sdeterministic.
-D 2011-01-26T06:13:15
+C Update\smutex1.test\sso\sthat\sit\sworks\swith\sthe\smemsubsys1\spermutation\s(pagecache\smemory).\sChange\sa\sfew\sinstances\sof\sSQLITE_MUTEX_STATIC_LRU2\sin\scomments\sand\stest\scode\sto\sSTATIC_PMEM.
+D 2011-01-26T07:25:33
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -153,8 +153,8 @@ F src/mutex.c 6949180803ff05a7d0e2b9334a95b4fb5a00e23f
 F src/mutex.h fe2ef5e1c4dae531d5a544f9241f19c56d26803d
 F src/mutex_noop.c d5cfbca87168c661a0b118cd8e329a908e453151
 F src/mutex_os2.c 6a62583e374ba3ac1a3fcc0da2bfdac7d3942689
-F src/mutex_unix.c abb8c98a6c27c57280e71522d059e929c708d019
-F src/mutex_w32.c b7ed3366a1d44a62a17d4eaefdaa2e7c25f944c2
+F src/mutex_unix.c b4f4e923bb8de93ec3f251fadb50855f23df9579
+F src/mutex_w32.c 3ade5ae71449d1d023f0ebb3184c2ae6aa9307e4
 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
@@ -208,7 +208,7 @@ F src/test_journal.c 785edd54f963aefb3c1628124170a56697c68c70
 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
 F src/test_malloc.c fd6188b1501c0010fb4241ddc9f0d5ac402c688d
 F src/test_multiplex.c 5990431a852aa21c9a67da748f23d2cf1e21f8fc
-F src/test_mutex.c ce06b59aca168cd8c520b77159a24352a7469bd3
+F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
 F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
 F src/test_osinst.c f408c6a181f2fb04c56273afd5c3e1e82f60392c
 F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8
@@ -567,7 +567,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 2fe5d592763e1aad6612b59fd862c8b1b0e0304b
+F test/mutex1.test 82327b00f725342ac037fa04f26abd188bf3d29f
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test a44e04df1486fcfb02d32468cbcd3c8e1e433723
 F test/notify1.test 8433bc74bd952fb8a6e3f8d7a4c2b28dfd69e310
@@ -897,7 +897,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P c85202baac49b22a4be36b9733d44f01d83edb28
-R 85ac3b6bb904f05f09996814ba9f096b
+P 84b0c2bc7125623be2ee526b5ca75e1b72debb93
+R 8125a99a44546cc6d7303e50e91f7f22
 U dan
-Z 780b8c90621146e71b5a8492b6618973
+Z 3df0eeee4d5857c3b53d4734fc7e090b

diff --git a/manifest.uuid b/manifest.uuid
index cda47ecd869d8f29732968b99ccc0d784906eaf7..d56e71e3cf500470d39ef9fbc98565bec7b8668d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-84b0c2bc7125623be2ee526b5ca75e1b72debb93
\ No newline at end of file
+456bd5c63b41bae8e389df81e318b830aa314000
\ No newline at end of file

diff --git a/src/mutex_unix.c b/src/mutex_unix.c
index 196975e717295fe0e933daf08addddeeec0504e9..aa9a8cf2650beb5d810e9a41d4bf5826ff26bbb6 100644 (file)
--- a/src/mutex_unix.c
+++ b/src/mutex_unix.c
@@ -99,7 +99,7 @@ static int pthreadMutexEnd(void){ return SQLITE_OK; }
 ** <li>  SQLITE_MUTEX_STATIC_MEM2
 ** <li>  SQLITE_MUTEX_STATIC_PRNG
 ** <li>  SQLITE_MUTEX_STATIC_LRU
-** <li>  SQLITE_MUTEX_STATIC_LRU2
+** <li>  SQLITE_MUTEX_STATIC_PMEM
 ** </ul>
 **
 ** The first two constants cause sqlite3_mutex_alloc() to create

diff --git a/src/mutex_w32.c b/src/mutex_w32.c
index fba964a46115f45d527321e872a8bac50fce1ee7..8e257a91b0e671744d74a5a237f9e0878cb420b7 100644 (file)
--- a/src/mutex_w32.c
+++ b/src/mutex_w32.c
@@ -156,7 +156,7 @@ static int winMutexEnd(void){
 ** <li>  SQLITE_MUTEX_STATIC_MEM2
 ** <li>  SQLITE_MUTEX_STATIC_PRNG
 ** <li>  SQLITE_MUTEX_STATIC_LRU
-** <li>  SQLITE_MUTEX_STATIC_LRU2
+** <li>  SQLITE_MUTEX_STATIC_PMEM
 ** </ul>
 **
 ** The first two constants cause sqlite3_mutex_alloc() to create

diff --git a/src/test_mutex.c b/src/test_mutex.c
index ff388f3769b6f9a3369d7b3674d6adb1a91e2ce2..0bb74375d8fd690fd5c4981399f4a2ba04875b7a 100644 (file)
--- a/src/test_mutex.c
+++ b/src/test_mutex.c
@@ -247,7 +247,7 @@ static int test_read_mutex_counters(
   int ii;
   char *aName[8] = {
     "fast",        "recursive",   "static_master", "static_mem", 
-    "static_open", "static_prng", "static_lru",    "static_lru2"
+    "static_open", "static_prng", "static_lru",    "static_pmem"
   };
 
   if( objc!=1 ){

diff --git a/test/mutex1.test b/test/mutex1.test
index e2f7c89fb39741a7213ebcc93c03e2600280aa7e..eeb33c133f49e74bdc67d45326d6a9bf81993888 100644 (file)
--- a/test/mutex1.test
+++ b/test/mutex1.test
@@ -101,10 +101,22 @@ ifcapable threadsafe&&shared_cache {
   set enable_shared_cache [sqlite3_enable_shared_cache 1]
   foreach {mode mutexes} {
     singlethread {}
-    multithread  {fast static_lru static_master static_mem static_open static_prng }
-    serialized  {fast recursive static_lru static_master static_mem static_open static_prng}
+    multithread  {
+      fast static_lru static_master static_mem static_open static_prng 
+    }
+    serialized  {
+      fast recursive static_lru static_master static_mem static_open static_prng
+    }
   } {
 
+    # Permutation "memsubsys1" configures a block of PAGECACHE memory. In
+    # multi-threaded and serialized modes, this causes SQLite to use the 
+    # STATIC_PMEM mutex as well.
+    #
+    if {[permutation] == "memsubsys1" && $mode != "singlethread"} {
+      lappend mutexes static_pmem
+    }
+
     do_test mutex1.2.$mode.1 {
       catch {db close}
       sqlite3_shutdown