database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-09 14:21:03 +03:00
Code Activity

Modified core to not call deprecated functions sqlite3_memory_alarm() and sqlite3_transfer_bindings() by adding sqlite3MemoryAlarm() and sqlite3TransferBindings(). sqlite3_memory_alarm() and sqlite3_transfer_bindings() are now simple wrappers for the new functions. In prep for adding SQLITE_OMIT_DEPRECATED. (CVS 5672)

Browse Source 
FossilOrigin-Name: 821c387d159fd86cedb56c1130f0416bf5c65e6c
This commit is contained in:
shane
2008-09-04 04:32:49 +00:00
parent 106cee5498
commit 4a27a28635
5 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/malloc.c
View File

@@ -12,7 +12,7 @@
**
** Memory allocation functions used throughout sqlite.
**
** $Id: malloc.c,v 1.40 2008/09/02 17:52:52 danielk1977 Exp $
** $Id: malloc.c,v 1.41 2008/09/04 04:32:49 shane Exp $
*/
#include "sqliteInt.h"
#include <stdarg.h>
@@ -45,9 +45,9 @@ void sqlite3_soft_heap_limit(int n){
}
sqlite3_initialize();
if( iLimit>0 ){
sqlite3_memory_alarm(softHeapLimitEnforcer, 0, iLimit);
sqlite3MemoryAlarm(softHeapLimitEnforcer, 0, iLimit);
}else{
sqlite3_memory_alarm(0, 0, 0);
sqlite3MemoryAlarm(0, 0, 0);
}
overage = sqlite3_memory_used() - n;
if( overage>0 ){
@@ -183,7 +183,7 @@ sqlite3_int64 sqlite3_memory_highwater(int resetFlag){
/*
** Change the alarm callback
*/
int sqlite3_memory_alarm(
int sqlite3MemoryAlarm(
void(*xCallback)(void *pArg, sqlite3_int64 used,int N),
void *pArg,
sqlite3_int64 iThreshold
@@ -196,6 +196,18 @@ int sqlite3_memory_alarm(
return SQLITE_OK;
}
/*
** Deprecated external interface. Internal/core SQLite code
** should call sqlite3MemoryAlarm.
*/
int sqlite3_memory_alarm(
void(*xCallback)(void *pArg, sqlite3_int64 used,int N),
void *pArg,
sqlite3_int64 iThreshold
){
return sqlite3MemoryAlarm(xCallback, pArg, iThreshold);
}
/*
** Trigger the alarm
*/