database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-10 01:02:56 +03:00
Code Activity

Use the actual size of memory allocations to update the memory status

Browse Source 
counters.  Fix the roundup() function of mem3 to be much closer to the
actual allocation size.  Ticket #3226. (CVS 5440)

FossilOrigin-Name: 5c22132eb171058f30ec5b7562b8164611236748
This commit is contained in:
drh
2008-07-18 18:56:16 +00:00
parent 4a0611dd29
commit c702c7ccdd
4 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/malloc.c
View File

@@ -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);
}
}