diff options
| author | drh <drh@noemail.net> | 2013-12-14 18:24:46 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-12-14 18:24:46 +0000 |
| commit | c8d985e09c2adc83a944889bd6e60e4e86864e3e (patch) | |
| tree | 462d90e333961e2779b511e3ef74e0505699940a /src/malloc.c | |
| parent | 65106c77bb5436a3a4ab16193cc9b98b9c09e228 (diff) | |
| parent | 4a8ee3dfe2afb5f0478b1bcdf94202cdf98a469d (diff) | |
| download | sqlite-c8d985e09c2adc83a944889bd6e60e4e86864e3e.tar.gz sqlite-c8d985e09c2adc83a944889bd6e60e4e86864e3e.zip | |
Merge in all recent preformance enhancements from trunk.
FossilOrigin-Name: 32477642d79615fb85680bdac812ad9655cf6902
Diffstat (limited to 'src/malloc.c')
| -rw-r--r-- | src/malloc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/malloc.c b/src/malloc.c index 799f0485d..9c11d0776 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -433,7 +433,7 @@ void sqlite3ScratchFree(void *p){ */ #ifndef SQLITE_OMIT_LOOKASIDE static int isLookaside(sqlite3 *db, void *p){ - return p && p>=db->lookaside.pStart && p<db->lookaside.pEnd; + return p>=db->lookaside.pStart && p<db->lookaside.pEnd; } #else #define isLookaside(A,B) 0 @@ -449,8 +449,9 @@ int sqlite3MallocSize(void *p){ return sqlite3GlobalConfig.m.xSize(p); } int sqlite3DbMallocSize(sqlite3 *db, void *p){ - assert( db==0 || sqlite3_mutex_held(db->mutex) ); - if( db && isLookaside(db, p) ){ + assert( db!=0 ); + assert( sqlite3_mutex_held(db->mutex) ); + if( isLookaside(db, p) ){ return db->lookaside.sz; }else{ assert( sqlite3MemdebugHasType(p, MEMTYPE_DB) ); |