From: drh <drh@noemail.net>
Date: Sat, 6 Dec 2008 14:34:33 +0000 (+0000)
Subject: Mark the hash table enlargement in pcache1.c as a benign-failure malloc. (CVS 5986)
X-Git-Tag: version-3.6.10~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=085bb7f094ecce2c1283896286912bfa824fc520;p=thirdparty%2Fsqlite.git

Mark the hash table enlargement in pcache1.c as a benign-failure malloc. (CVS 5986)

FossilOrigin-Name: 5c0fe63a6374abe98e45c11ada54c064c19bbab8
---

diff --git a/manifest b/manifest
index 8e66367b5c..18d9909619 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sminimum\sallocate\ssize\sfor\sRowSet\sobjects\slarge\senough\sto\saccommodate\n8-byte\spointers.\s(CVS\s5985)
-D 2008-12-05T23:40:23
+C Mark\sthe\shash\stable\senlargement\sin\spcache1.c\sas\sa\sbenign-failure\smalloc.\s(CVS\s5986)
+D 2008-12-06T14:34:34
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -144,7 +144,7 @@ F src/pager.h a02ef8e6cc7e78b54874166e5ce786c9d4c489bf
 F src/parse.y 72397fe334b25b4f3411edbf49b5b706f2d7bdae
 F src/pcache.c 16dc8da6e6ba6250f8dfd9ee46036db1cbceedc6
 F src/pcache.h f20c3e82dd6da622c3fe296170cb1801f9a2d75a
-F src/pcache1.c d8d412326cc5123ba3bfaa66e36205ca8c5dbc5e
+F src/pcache1.c fb6cf5b80996ed316842d25005f4981bef7ce548
 F src/pragma.c 539e28c90e782fa909a3b3a6849d18a9eb11a548
 F src/prepare.c fcadb25d2ad722d87103517333c825b56b79a770
 F src/printf.c e29d9475c63e1dbfae005b98da3a60e07b5c1ca5
@@ -663,7 +663,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 2a3f5ce14c050b135ab9d2247aee84ca37882c4b
-R efe8c4473ee08146a9eec908055013bb
+P b74885e0856c46412f7cf4dca4cafb740cb9a28b
+R 997ea21ad516baa17cf443328059f52c
 U drh
-Z 7ac988f57789a018d22ba18a4c2f1c55
+Z 6b35b4a449b1c4adc2bef7e3b802cdc0
diff --git a/manifest.uuid b/manifest.uuid
index e890fc4f4f..a5fe11cf25 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b74885e0856c46412f7cf4dca4cafb740cb9a28b
\ No newline at end of file
+5c0fe63a6374abe98e45c11ada54c064c19bbab8
\ No newline at end of file
diff --git a/src/pcache1.c b/src/pcache1.c
index 8140f99672..cfaf5aadb5 100644
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -16,7 +16,7 @@
 ** If the default page cache implementation is overriden, then neither of
 ** these two features are available.
 **
-** @(#) $Id: pcache1.c,v 1.4 2008/11/24 20:05:39 shane Exp $
+** @(#) $Id: pcache1.c,v 1.5 2008/12/06 14:34:34 drh Exp $
 */
 
 #include "sqliteInt.h"
@@ -263,7 +263,9 @@ static int pcache1ResizeHash(PCache1 *p){
   }
 
   pcache1LeaveMutex();
+  if( p->nHash ){ sqlite3BeginBenignMalloc(); }
   apNew = (PgHdr1 **)sqlite3_malloc(sizeof(PgHdr1 *)*nNew);
+  if( p->nHash ){ sqlite3EndBenignMalloc(); }
   pcache1EnterMutex();
   if( apNew ){
     memset(apNew, 0, sizeof(PgHdr1 *)*nNew);