Add the SQLITE_MAX_MEMORY compile-time option that provides a hard upper bound

on the amount of memory that SQLite will use, per process.

FossilOrigin-Name: 77dfe2abdae88dea81217f352d87e5ba2c822715

diff --git a/manifest b/manifest
index 5c43042028e251defd4726f6f116bf2a16551f96..05fc15b13a94fcf62f2dffbba88a1b8ab257614e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\s".stats"\sdot-command\sin\sthe\sCLI\sto\suse\ssqlite3_status64()\sinstead\nof\ssqlite3_status().
-D 2017-03-10T14:36:10.584
+C Add\sthe\sSQLITE_MAX_MEMORY\scompile-time\soption\sthat\sprovides\sa\shard\supper\sbound\non\sthe\samount\sof\smemory\sthat\sSQLite\swill\suse,\sper\sprocess.
+D 2017-03-10T15:55:54.959
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@ -365,7 +365,7 @@ F src/insert.c 3ed64afc49c0a2221e397b9f65d231ffbef506fe
 F src/legacy.c e88ed13c2d531decde75d42c2e35623fb9ce3cb0
 F src/loadext.c a68d8d1d14cf7488bb29dc5311cb1ce9a4404258
 F src/main.c 158326243c5ddc8b98a1e983fa488650cf76d760
-F src/malloc.c d0a1474236486165bcb349af82e2a6560178bf7b
+F src/malloc.c 96f86a14b04fce2cb9559ccb3a2ae4534131094e
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c fd7cd6fe21d46fe0a4186367dd8dc26d87b787eb
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@ -1563,7 +1563,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b044b152aac2ec606750940ea816ad4a4aef8eb6
-R da300103282ee8980f2e41cc2466def0
+P 118f5c0564fef70cbd06fc0d9dbb2baec162cc39
+R 32dd2e22d477f93aeae962c3294c4485
+T *branch * max-memory-option
+T *sym-max-memory-option *
+T -sym-trunk *
 U drh
-Z 6dbad136ee05d7b8bc7f34310ddbaf47
+Z 9eb3e2d252d807f2c1277379e9be3f8a

diff --git a/manifest.uuid b/manifest.uuid
index f610b09f285685f49bbee3c70405f0c032ba38cb..27ef1bc7b1ebdebd76c13dc5d6704c82d8fc29b2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-118f5c0564fef70cbd06fc0d9dbb2baec162cc39
\ No newline at end of file
+77dfe2abdae88dea81217f352d87e5ba2c822715
\ No newline at end of file

diff --git a/src/malloc.c b/src/malloc.c
index 0fdc8d73ffca7c145d348ed47d92b26c55c9221a..b942f47b284a927387b2f33d70b4504a12a00f49 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -217,7 +217,7 @@ static void sqlite3MallocAlarm(int nByte){
 ** Do a memory allocation with statistics and alarms.  Assume the
 ** lock is already held.
 */
-static void mallocWithAlarm(int n, void **pp){
+static void *mallocWithAlarm(int n){
   void *p;
   int nFull;
   assert( sqlite3_mutex_held(mem0.mutex) );
@@ -230,6 +230,12 @@ static void mallocWithAlarm(int n, void **pp){
   ** following xRoundup() call. */
   nFull = sqlite3GlobalConfig.m.xRoundup(n);
 
+#ifdef SQLITE_MAX_MEMORY
+  if( sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED)+nFull>SQLITE_MAX_MEMORY ){
+    return 0;
+  }
+#endif
+
   sqlite3StatusHighwater(SQLITE_STATUS_MALLOC_SIZE, n);
   if( mem0.alarmThreshold>0 ){
     sqlite3_int64 nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
@@ -252,7 +258,7 @@ static void mallocWithAlarm(int n, void **pp){
     sqlite3StatusUp(SQLITE_STATUS_MEMORY_USED, nFull);
     sqlite3StatusUp(SQLITE_STATUS_MALLOC_COUNT, 1);
   }
-  *pp = p;
+  return p;
 }
 
 /*
@@ -270,7 +276,7 @@ void *sqlite3Malloc(u64 n){
     p = 0;
   }else if( sqlite3GlobalConfig.bMemstat ){
     sqlite3_mutex_enter(mem0.mutex);
-    mallocWithAlarm((int)n, &p);
+    p = mallocWithAlarm((int)n);
     sqlite3_mutex_leave(mem0.mutex);
   }else{
     p = sqlite3GlobalConfig.m.xMalloc((int)n);