diff options
| author | drh <drh@noemail.net> | 2008-07-18 18:56:16 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2008-07-18 18:56:16 +0000 |
| commit | c702c7ccddbff5b366193498ce62cf658a0cf7eb (patch) | |
| tree | fdbbaf11f6570b8a7804478239b07d3021d6207b /src/malloc.c | |
| parent | 4a0611dd29bf811e034b1d581c501d9076158ced (diff) | |
| download | sqlite-c702c7ccddbff5b366193498ce62cf658a0cf7eb.tar.gz sqlite-c702c7ccddbff5b366193498ce62cf658a0cf7eb.zip | |
Use the actual size of memory allocations to update the memory status
counters. Fix the roundup() function of mem3 to be much closer to the
actual allocation size. Ticket #3226. (CVS 5440)
FossilOrigin-Name: 5c22132eb171058f30ec5b7562b8164611236748
Diffstat (limited to 'src/malloc.c')
| -rw-r--r-- | src/malloc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/malloc.c b/src/malloc.c index 317061c1f..86ba2be96 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -12,7 +12,7 @@ ** ** Memory allocation functions used throughout sqlite. ** -** $Id: malloc.c,v 1.28 2008/07/14 12:38:21 drh Exp $ +** $Id: malloc.c,v 1.29 2008/07/18 18:56:17 drh Exp $ */ #include "sqliteInt.h" #include <stdarg.h> @@ -224,7 +224,10 @@ static int mallocWithAlarm(int n, void **pp){ sqlite3MallocAlarm(nFull); p = sqlite3Config.m.xMalloc(nFull); } - if( p ) sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, nFull); + if( p ){ + nFull = sqlite3MallocSize(p); + sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, nFull); + } *pp = p; return nFull; } @@ -504,6 +507,7 @@ void *sqlite3Realloc(void *pOld, int nBytes){ pNew = sqlite3Config.m.xRealloc(pOld, nNew); } if( pNew ){ + nNew = sqlite3MallocSize(pNew); sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, nNew-nOld); } } |