Changes to setupLookaside() in main.c to better handle lookaside buffer configuration...

FossilOrigin-Name: 0a2c7f740397c5c6373434c75d73c2714f14dd32

diff --git a/manifest b/manifest
index 772bf4d79a10c9c18a97e47c0ae8a182bce73fc1..ffcb28f1e31bf28410e91c317bbda564f63959df 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Implemented\sthe\sSQLITE_LAST_ERRNO\sop\sin\sthe\sxFileControl()\smethod\sof\sos_win.c.\s\sTicket\s#3615.\s(CVS\s6217)
-D 2009-01-30T05:59:11
+C Changes\sto\ssetupLookaside()\sin\smain.c\sto\sbetter\shandle\slookaside\sbuffer\sconfigurations\sof\szero-size.\s\sTicket\s#3616.\s(CVS\s6218)
+D 2009-01-30T06:11:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 3871d308188cefcb7c5ab20da4c7b6aad023bc52
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -122,7 +122,7 @@ F src/insert.c f6db1e6f43aae337e64a755208abb6ff124edc19
 F src/journal.c e00df0c0da8413ab6e1bb7d7cab5665d4a9000d0
 F src/legacy.c 8b3b95d48d202614946d7ce7256e7ba898905c3b
 F src/loadext.c 3f96631089fc4f3871a67f02f2e4fc7ea4d51edc
-F src/main.c da5ff4dfbb59896af5f7b4afaef48d2fb7d08a7d
+F src/main.c d4d52cf35438c15c3f1b4607b7cd32a7b90bc37a
 F src/malloc.c bc408056b126db37b6fba00e170d578cc67be6b3
 F src/mem0.c f2f84062d1f35814d6535c9f9e33de3bfb3b132c
 F src/mem1.c 3bfb39e4f60b0179713a7c087b2d4f0dc205735f
@@ -693,7 +693,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P e764a7c5d369e2ff736d662b1209b3d54d778caf
-R 7318ae3ef11b6ac082650c723e29b00f
+P 9ea871f3e8ce1ec5cffb72f13704c3002d3f5383
+R bda281c14bbdb7d7dba2a062068f24de
 U shane
-Z 2cd587a9902c283d8f25ced3dddc86fb
+Z 650ab35123eaec11247543bf155740af

diff --git a/manifest.uuid b/manifest.uuid
index bba23de66f7113599b77f46fd66517abae6a08e6..e560ae04036224e0640a861cc0729db5007fb0a1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9ea871f3e8ce1ec5cffb72f13704c3002d3f5383
\ No newline at end of file
+0a2c7f740397c5c6373434c75d73c2714f14dd32
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 35272048af36ee470f6ba1fa3c8a2394843f3f4f..11708fd41d32e492140f5a3db4b3831006f7d317 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.522 2009/01/20 16:53:41 danielk1977 Exp $
+** $Id: main.c,v 1.523 2009/01/30 06:11:55 shane Exp $
 */
 #include "sqliteInt.h"
 
@@ -386,9 +386,22 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
   if( db->lookaside.nOut ){
     return SQLITE_BUSY;
   }
-  if( sz<0 ) sz = 0;
+  /* Free any existing lookaside buffer for this handle before
+  ** allocating a new one so we don't have to have space for 
+  ** both at the same time.
+  */
+  if( db->lookaside.bMalloced ){
+    sqlite3_free(db->lookaside.pStart);
+  }
+  /* The size of a lookaside slot needs to be larger than a pointer
+  ** to be useful.
+  */
+  if( sz<=sizeof(LookasideSlot*) ) sz = 0;
   if( cnt<0 ) cnt = 0;
-  if( pBuf==0 ){
+  if( sz==0 || cnt==0 ){
+    sz = 0;
+    pStart = 0;
+  }else if( pBuf==0 ){
     sz = (sz + 7)&~7;
     sqlite3BeginBenignMalloc();
     pStart = sqlite3Malloc( sz*cnt );
@@ -397,16 +410,13 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
     sz = sz&~7;
     pStart = pBuf;
   }
-  if( db->lookaside.bMalloced ){
-    sqlite3_free(db->lookaside.pStart);
-  }
   db->lookaside.pStart = pStart;
   db->lookaside.pFree = 0;
   db->lookaside.sz = (u16)sz;
-  db->lookaside.bMalloced = pBuf==0 ?1:0;
   if( pStart ){
     int i;
     LookasideSlot *p;
+    assert( sz > sizeof(LookasideSlot*) );
     p = (LookasideSlot*)pStart;
     for(i=cnt-1; i>=0; i--){
       p->pNext = db->lookaside.pFree;
@@ -415,9 +425,11 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
     }
     db->lookaside.pEnd = p;
     db->lookaside.bEnabled = 1;
+    db->lookaside.bMalloced = pBuf==0 ?1:0;
   }else{
     db->lookaside.pEnd = 0;
     db->lookaside.bEnabled = 0;
+    db->lookaside.bMalloced = 0;
   }
   return SQLITE_OK;
 }