aboutsummaryrefslogtreecommitdiff
path: root/src/malloc.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2016-02-05 02:42:54 +0000
committerdrh <drh@noemail.net>2016-02-05 02:42:54 +0000
commitb84e574c8923b5bcb0b50fbb5a36f4a12b4cde0d (patch)
tree6c93e05dc7e60e5b4c128b0d425b54ca1208c80a /src/malloc.c
parent4a642b60607e55a2c25f663b472af3609c76b214 (diff)
downloadsqlite-b84e574c8923b5bcb0b50fbb5a36f4a12b4cde0d.tar.gz
sqlite-b84e574c8923b5bcb0b50fbb5a36f4a12b4cde0d.zip
Further performance improvements that fall out of the mallocFailed changes.
FossilOrigin-Name: d94416ddca8f7ed727dd335d38155ea5945a86b7
Diffstat (limited to 'src/malloc.c')
-rw-r--r--src/malloc.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/malloc.c b/src/malloc.c
index 057d36a4b..441b4cb67 100644
--- 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);