More mutexes around another sqlite3StatusAdd() call.

FossilOrigin-Name: e3b500fb5d93d98e6e1ddf6d494a841274d1b68d

diff --git a/manifest b/manifest
index 65250024d5ca4fe47d693f93f2d17879785a88cd..44177aef1043e76f8f52b390f3cd9098535e149d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Add\sa\smutex\saround\san\ssqlite3StatusAdd()\scall\sto\sprevent\sthe\spagecount\noverflow\smeasurements\sfrom\sgetting\soff\sin\smultithreaded\sapplications.
-D 2011-01-26T13:24:40.120
+C More\smutexes\saround\sanother\ssqlite3StatusAdd()\scall.
+D 2011-01-26T13:28:06.817
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -170,7 +170,7 @@ F src/pager.h 0ea59db2a33bc6c2c02cae34de33367e1effdf76
 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
 F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
-F src/pcache1.c a3665bec02fd1859a448685bb9f62ddf75dafe7d
+F src/pcache1.c d548e31beafa792d1994b663a29a5303569efc4e
 F src/pragma.c 8a6cd3c787f882fa44f6490d2411fc26839ce8f3
 F src/prepare.c 395b3fab1b93f45b6aa194b23ebc201221c47b99
 F src/printf.c df2ff3bb5409e8958136933342c46464fbd017e7
@@ -900,14 +900,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 456bd5c63b41bae8e389df81e318b830aa314000
-R e9ff079b5376d2fdaa7dd27f5d3aa591
+P 3d8b298dc24fe13a3f390da41f79b8613a6f25a7
+R 8bec252fd5dcf071b20c7cceab03d8a2
 U drh
-Z 0347c394dd69de4fec8d697e37a04dc3
+Z 3c6d45926fd8efb972d0995d2c3bad6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFNQCCboxKgR168RlERAgYTAJ949Xo1bAfltv62PyaX5TgKLvA4aACfTdqt
-FRsrM3bWeZxqlcofaLsFcCo=
-=atuH
+iD8DBQFNQCFqoxKgR168RlERAiwGAJ0cBumTFjZ5105DfX3qiQyGjRZTKACghazJ
+nCeAfq7e8ZlzhwHXe9OFZXA=
+=p/dR
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 26ffaf510de9f36a4a1f523cb846d28458ec495d..8184da4041c735f97d190ad300116313104f2cbe 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3d8b298dc24fe13a3f390da41f79b8613a6f25a7
\ No newline at end of file
+e3b500fb5d93d98e6e1ddf6d494a841274d1b68d
\ No newline at end of file

diff --git a/src/pcache1.c b/src/pcache1.c
index f2b2b419c83159a07a0c809bdc04c93d8b10e59b..ad443954bffd0901fcc3e0e93a3b0788d7b997c4 100644 (file)
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -258,7 +258,9 @@ static void pcache1Free(void *p){
     assert( sqlite3MemdebugHasType(p, MEMTYPE_PCACHE) );
     sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
     iSize = sqlite3MallocSize(p);
+    sqlite3_mutex_enter(pcache1.mutex);
     sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, -iSize);
+    sqlite3_mutex_leave(pcache1.mutex);
     sqlite3_free(p);
   }
 }