Fix issue with mem5 allocator when min request size is larger thatn 2^30.

FossilOrigin-Name: d7dae06fb2d57ed6b9555b774712f42077ae4155

diff --git a/manifest b/manifest
index 6e716ca725664e894b06c01735eb6c0b819bb336..1606e30842620451c15d8a77cd65dd9843fa69d0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Omit\sunnecessary\sOP_Next\sand\sOP_Prev\soperators\swhen\suniqueness\sconstraints\nguarantee\sthat\sthe\scode\swill\sonly\smake\sone\spass\sthrough\sthe\sloop.
-D 2011-03-09T21:02:31.691
+C Fix\sissue\swith\smem5\sallocator\swhen\smin\srequest\ssize\sis\slarger\sthatn\s2^30.
+D 2011-03-09T21:36:17.288
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -146,13 +143,13 @@ F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
-F src/main.c 93d0d967d6898fc0408ece248342342e312aa753
+F src/main.c b43dc11c8335ceb759d48358ddafe09f02b18a1d
 F src/malloc.c 92d59a007d7a42857d4e9454aa25b6b703286be1
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
 F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
 F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
-F src/mem5.c 6fe00f46997bebb690397cb029719f711e7640e3
+F src/mem5.c ebc2530757a9b0f44b61a899aef0109effd55ce8
 F src/memjournal.c 0ebce851677a7ac035ba1512a7e65851b34530c6
 F src/mutex.c 6949180803ff05a7d0e2b9334a95b4fb5a00e23f
 F src/mutex.h fe2ef5e1c4dae531d5a544f9241f19c56d26803d
@@ -181,7 +178,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
 F src/shell.c 649c51979812f77f97507024a4cea480c6862b8b
-F src/sqlite.h.in 82274d7f4440b99a80d8cc4f077547fd0b596017
+F src/sqlite.h.in 369c767e6b9f101d63d8e4c5e40279f975ccec08
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 F src/sqliteInt.h 2cea3e47997e3f4d9b4f1ce62f99c35be1b5a586
 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
@@ -562,6 +559,7 @@ F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
 F test/mallocK.test d79968641d1b70d88f6c01bdb9a7eb4a55582cc9
 F test/malloc_common.tcl 660b82ab528521cc4a48ff6df05ca3b6a00d47c5
 F test/manydb.test b3d3bc4c25657e7f68d157f031eb4db7b3df0d3c
+F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 F test/memdb.test 0825155b2290e900264daaaf0334b6dfe69ea498
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 F test/memsubsys1.test 679db68394a5692791737b150852173b3e2fea10
@@ -914,14 +912,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P dc46156a2237701679433779b871844f4f2abe4b
-R 6a96206125f553ae6e4986479b4fa19e
-U drh
-Z 3c4f85bbdfea18f22f89d0b2d92c8936
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFNd+rroxKgR168RlERAk+tAJ9jEIHTwnjObklOR5pMe4sV08k4IgCeI8br
-wFEqDe541wz3+xTQUIuHIUY=
-=D87j
------END PGP SIGNATURE-----
+P f000c9b2b7348238fe2085140d2dd05294a19709
+R 5c4a42c07b3ab928630b72159bbdf550
+U shaneh
+Z 82918d77f73b87eb8c0dd11fedd7903d

diff --git a/manifest.uuid b/manifest.uuid
index 8d40b7424de0074c9c7c43efd287c1185c38995a..dfe5c5375a00d1957eb7530b5bd697acecf97649 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f000c9b2b7348238fe2085140d2dd05294a19709
\ No newline at end of file
+d7dae06fb2d57ed6b9555b774712f42077ae4155
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 833b9812b0cc6f2b0b3365637b8ebabd83f6a7cf..1329ae27a9cb254ddb755150d2561711a3cad852 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -375,6 +375,13 @@ int sqlite3_config(int op, ...){
       sqlite3GlobalConfig.nHeap = va_arg(ap, int);
       sqlite3GlobalConfig.mnReq = va_arg(ap, int);
 
+      if( sqlite3GlobalConfig.mnReq<1 ){
+        sqlite3GlobalConfig.mnReq = 1;
+      }else if( sqlite3GlobalConfig.mnReq>(1<<12) ){
+        /* cap min request size at 2^12 */
+        sqlite3GlobalConfig.mnReq = (1<<12);
+      }
+
       if( sqlite3GlobalConfig.pHeap==0 ){
         /* If the heap pointer is NULL, then restore the malloc implementation
         ** back to NULL pointers too.  This will cause the malloc to go

diff --git a/src/mem5.c b/src/mem5.c
index 2fdfac141358a359b33a245576f8f70b10533132..13310be2b0a10a575718c0025555bd243fa0696f 100644 (file)
--- a/src/mem5.c
+++ b/src/mem5.c
@@ -442,7 +442,7 @@ static int memsys5Roundup(int n){
 */
 static int memsys5Log(int iValue){
   int iLog;
-  for(iLog=0; (1<<iLog)<iValue; iLog++);
+  for(iLog=0; (iLog<((sizeof(int)*8)-2)) && (1<<iLog)<iValue; iLog++);
   return iLog;
 }
 
@@ -473,7 +473,10 @@ static int memsys5Init(void *NotUsed){
   zByte = (u8*)sqlite3GlobalConfig.pHeap;
   assert( zByte!=0 );  /* sqlite3_config() does not allow otherwise */
 
-  nMinLog = memsys5Log(sqlite3GlobalConfig.mnReq);
+  /* boundaries on sqlite3GlobalConfig.mnReq are enforced in sqlite3_config() */
+  nMinLog = sqlite3GlobalConfig.mnReq;
+  assert( nMinLog>0 && nMinLog<=(1<<12) );
+  nMinLog = memsys5Log(nMinLog);
   mem5.szAtom = (1<<nMinLog);
   while( (int)sizeof(Mem5Link)>mem5.szAtom ){
     mem5.szAtom = mem5.szAtom << 1;

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index ebabee8ed7c2077532611e603eab525204fabfb3..179ae98e207c05b5b780c95734dfed6ae01fe902 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -1360,7 +1360,9 @@ struct sqlite3_mem_methods {
 ** [SQLITE_ENABLE_MEMSYS5] are defined, then the alternative memory
 ** allocator is engaged to handle all of SQLites memory allocation needs.
 ** The first pointer (the memory pointer) must be aligned to an 8-byte
-** boundary or subsequent behavior of SQLite will be undefined.</dd>
+** boundary or subsequent behavior of SQLite will be undefined.
+** The minimum allocation size is capped at 2^12. Reasonable values
+** for the minimum allocation size are 2^5 through 2^8.</dd>
 **
 ** <dt>SQLITE_CONFIG_MUTEX</dt>
 ** <dd> ^(This option takes a single argument which is a pointer to an

diff --git a/test/mem5.test b/test/mem5.test
new file mode 100644 (file)
index 0000000..6365f1c
--- /dev/null
+++ b/test/mem5.test
@@ -0,0 +1,66 @@
+# 2011 March 9
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# This file contains tests of the mem5 allocation subsystem.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+ifcapable !mem5 {
+  finish_test
+  return
+}
+
+# The tests in this file configure the lookaside allocator after a 
+# connection is opened. This will not work if there is any "presql"
+# configured (SQL run within the [sqlite3] wrapper in tester.tcl).
+if {[info exists ::G(perm:presql)]} {
+  finish_test
+  return
+}
+
+do_test mem5-1.1 {
+  catch {db close}
+  sqlite3_shutdown
+  sqlite3_config_heap 25000000 0
+  sqlite3_config_lookaside 0 0
+  sqlite3_initialize
+} {SQLITE_OK}
+
+# try with min request size = 2^30
+do_test mem5-1.2 {
+  catch {db close}
+  sqlite3_shutdown
+  sqlite3_config_heap 1 1073741824
+  sqlite3_config_lookaside 0 0
+  sqlite3_initialize
+} {SQLITE_NOMEM}
+
+# try with min request size = 2^30+1
+# previously this was causing the memsys5Log() func to infinitely loop.
+do_test mem5-1.3 {
+  catch {db close}
+  sqlite3_shutdown
+  sqlite3_config_heap 1 1073741825
+  sqlite3_config_lookaside 0 0
+  sqlite3_initialize
+} {SQLITE_NOMEM}
+
+do_test mem5-1.4 {
+  catch {db close}
+  sqlite3_shutdown
+  sqlite3_config_heap 0 0
+  sqlite3_config_lookaside 0 0
+  sqlite3_initialize
+} {SQLITE_OK}
+
+finish_test