Provide an (undocumented) compile-time option to disable the page cache

overflow counter, in order to avoid a mutex.

FossilOrigin-Name: 208825cd830748a2ca456affc57be75bbe618e47

diff --git a/manifest b/manifest
index fbf5a657fb33ee30437a1dec0bc2d633e154f863..2a453a97059b0cd2bc6cd0a38d705915170c6a27 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\sClang\swarnings.
-D 2012-06-06T23:59:36.067
+C Provide\san\s(undocumented)\scompile-time\soption\sto\sdisable\sthe\spage\scache\noverflow\scounter,\sin\sorder\sto\savoid\sa\smutex.
+D 2012-06-07T02:35:29.974
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4f37eb61be9d38643cdd839a74b8e3bad724cfcf
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -171,7 +171,7 @@ F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
 F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
-F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
+F src/pcache1.c 2234d84f9c003d800a57f00f8535c91667fa4f6c
 F src/pragma.c eee3e3161f82a1e06f632a8d2a82b29ba3c45889
 F src/prepare.c 33291b83cca285718048d219c67b8298501fa3a5
 F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
@@ -1005,7 +1005,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P baa8b7830779d5797e210a2e057181413412e152
-R f3c80d376d96bec331a1d34f3039877a
+P 31fe1985ad6be5eb04bbe85da378c2385c503ceb
+R c9b7e3ab6dcecb0e1f4bc1dec449f209
 U drh
-Z 3a2862b939ba347e67b7710215b7f1c2
+Z 08d748f35a747f23b9b024d61c3db611

diff --git a/manifest.uuid b/manifest.uuid
index 9f563c3ef9393a0f73be740acf68c6b341cd1711..90fe997bca3f1a7458571c646c7a2cf96a527ce2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-31fe1985ad6be5eb04bbe85da378c2385c503ceb
\ No newline at end of file
+208825cd830748a2ca456affc57be75bbe618e47
\ No newline at end of file

diff --git a/src/pcache1.c b/src/pcache1.c
index 42fc8ceba9cd28624dc5784dc2863f34ea5daa33..c41b49e6c86d193bb6920b07ac1e2e21b9baaff8 100644 (file)
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -212,12 +212,14 @@ static void *pcache1Alloc(int nByte){
     ** it from sqlite3Malloc instead.
     */
     p = sqlite3Malloc(nByte);
+#ifndef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
     if( p ){
       int sz = sqlite3MallocSize(p);
       sqlite3_mutex_enter(pcache1.mutex);
       sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, sz);
       sqlite3_mutex_leave(pcache1.mutex);
     }
+#endif
     sqlite3MemdebugSetType(p, MEMTYPE_PCACHE);
   }
   return p;
@@ -244,9 +246,11 @@ static int pcache1Free(void *p){
     assert( sqlite3MemdebugHasType(p, MEMTYPE_PCACHE) );
     sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
     nFreed = sqlite3MallocSize(p);
+#ifndef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
     sqlite3_mutex_enter(pcache1.mutex);
     sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, -nFreed);
     sqlite3_mutex_leave(pcache1.mutex);
+#endif
     sqlite3_free(p);
   }
   return nFreed;