Further performance improvements that fall out of the mallocFailed changes.

FossilOrigin-Name: d94416ddca8f7ed727dd335d38155ea5945a86b7

diff --git a/manifest b/manifest
index d515b0a7f107b8a3f35225265a5664bc3be92e36..667cb055a4a817680def3a1858403dc353c9b9c7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\sway\sthat\sOOM\serrors\sare\sprocessed.
-D 2016-02-05T01:55:27.277
+C Further\sperformance\simprovements\sthat\sfall\sout\sof\sthe\smallocFailed\schanges.
+D 2016-02-05T02:42:54.123
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
@@ -294,7 +294,7 @@ F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
 F src/btree.c 0b359bcc2316a57acf12f583253974ad22b4654f
 F src/btree.h 368ceeb4bd9312dc8df2ffd64b4b7dbcf4db5f8e
 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
-F src/build.c dcb55142c4c4293cbec181ef1ae1485ce0bc94d6
+F src/build.c 784c61366e79092b16e116372e66930775d2e6dc
 F src/callback.c ed6c2a4a712eb7287ff64e20e3c23265dfb8a7ce
 F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
 F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@ -314,7 +314,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c b1b0880fc474abfab89e737b0ecfde0bd7a60902
 F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
 F src/main.c 62b7fe3ed245757d1ff2e6268a7ec0bc30100308
-F src/malloc.c 65168ef91884206bf3fa14a3070e79255561324b
+F src/malloc.c 92ca6e16c90fb10f97844c08061bd8381423eb89
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@ -417,7 +417,7 @@ F src/vdbe.c 2e49c5d1b8f2f24f91ddd6c6b003d8e7fbbc4e56
 F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
 F src/vdbeInt.h 4b69d5451bcadd473e745af53ef1e8abfdce0a79
 F src/vdbeapi.c 9324f6baee1a1b2284c6543e98f916888a81e459
-F src/vdbeaux.c 0e66330ac8ad473bdefde88278725202d0174ae5
+F src/vdbeaux.c 777461529f862623e9164eb954fc53e54ddd650a
 F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
 F src/vdbemem.c 9a6736339ca581f3b9503d5a1a40b7d718ca4635
 F src/vdbesort.c ef3c6d1f1a7d44cf67bb2bee59ea3d1fe5bad174
@@ -1426,10 +1426,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 42736fb0adc82a0fb692850ff3dd3f9b501cbf1f
-R 1d34f5ef33e19e0d2d7f06ad149ac201
-T *branch * oom-handling
-T *sym-oom-handling *
-T -sym-trunk *
+P c3ef03478a5788c855b3aef385d43ae7f494f440
+R 84df2aaa23afa82bffc643c1855a9e65
 U drh
-Z a95dbad943095aee523b449d4529a303
+Z 8d53cc14407430cf1880951ea3d679f2

diff --git a/manifest.uuid b/manifest.uuid
index a42eab21cd7e37da4d06749058ca8d0077431349..eedb6d9e7d5b676e231ceb64c62b0e9256109e1c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c3ef03478a5788c855b3aef385d43ae7f494f440
\ No newline at end of file
+d94416ddca8f7ed727dd335d38155ea5945a86b7
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 097149fd4f8dde996546268602b96dddb05a3751..4185f48e93b168c0d757919726dd7069bb8f63c7 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -4366,10 +4366,9 @@ With *sqlite3WithAdd(
   }else{
     pNew = sqlite3DbMallocZero(db, sizeof(*pWith));
   }
-  assert( zName!=0 || pNew==0 );
-  assert( db->mallocFailed==0 || pNew==0 );
+  assert( (pNew!=0 && zName!=0) || db->mallocFailed );
 
-  if( pNew==0 ){
+  if( db->mallocFailed ){
     sqlite3ExprListDelete(db, pArglist);
     sqlite3SelectDelete(db, pQuery);
     sqlite3DbFree(db, zName);

diff --git a/src/malloc.c b/src/malloc.c
index 057d36a4bed9e59ee27ee81e090fa435a4599535..441b4cb67d72721a5acc7f06c177c1bb9a8438a1 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -645,22 +645,26 @@ static SQLITE_NOINLINE void *dbMallocRawFinish(sqlite3 *db, u64 n){
   return p;
 }
 
+/* Forward declaration */
+static SQLITE_NOINLINE void *dbReallocFinish(sqlite3 *db, void *p, u64 n);
+
 /*
 ** Resize the block of memory pointed to by p to n bytes. If the
 ** resize fails, set the mallocFailed flag in the connection object.
 */
 void *sqlite3DbRealloc(sqlite3 *db, void *p, u64 n){
-  void *pNew = 0;
   assert( db!=0 );
+  if( p==0 ) return sqlite3DbMallocRaw(db, n);
   assert( sqlite3_mutex_held(db->mutex) );
+  if( isLookaside(db,p) && n<=db->lookaside.sz ) return p;
+  return dbReallocFinish(db, p, n);
+}
+static SQLITE_NOINLINE void *dbReallocFinish(sqlite3 *db, void *p, u64 n){
+  void *pNew = 0;
+  assert( db!=0 );
+  assert( p!=0 );
   if( db->mallocFailed==0 ){
-    if( p==0 ){
-      return sqlite3DbMallocRaw(db, n);
-    }
     if( isLookaside(db, p) ){
-      if( n<=db->lookaside.sz ){
-        return p;
-      }
       pNew = sqlite3DbMallocRaw(db, n);
       if( pNew ){
         memcpy(pNew, p, db->lookaside.sz);

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 7d3a8c429315fdf8b4603302c590ae2e699e9019..334f54e414b4525dee7bcaef7ed4e907051373a6 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2511,7 +2511,7 @@ int sqlite3VdbeHalt(Vdbe *p){
   ** one, or the complete transaction if there is no statement transaction.
   */
 
-  if( p->db->mallocFailed ){
+  if( db->mallocFailed ){
     p->rc = SQLITE_NOMEM;
   }
   if( p->aOnceFlag ) memset(p->aOnceFlag, 0, p->nOnceFlag);
@@ -2672,7 +2672,7 @@ int sqlite3VdbeHalt(Vdbe *p){
   }
   p->magic = VDBE_MAGIC_HALT;
   checkActiveVdbeCnt(db);
-  if( p->db->mallocFailed ){
+  if( db->mallocFailed ){
     p->rc = SQLITE_NOMEM;
   }