Change the name of the Pager.pFree field to Pager.pMmapFreelist.

FossilOrigin-Name: 611bd824c24a60d298f28705de323fa2e813a308

diff --git a/manifest b/manifest
index 7b9df5476e20bc60ba59c311c552edf00604586f..a2e312e3a65c795ae0758119e0c3632eee9bcb3d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sbtree.c,\ssave\sthe\spositions\sof\sany\sopen\scursors\sbefore\smoving\sany\spages\saround\sto\sauto-vacuum\sthe\sdatabase\son\scommit.
-D 2013-03-26T14:16:20.450
+C Change\sthe\sname\sof\sthe\sPager.pFree\sfield\sto\sPager.pMmapFreelist.
+D 2013-03-26T14:36:11.815
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in df3e48659d80e1b7765785d8d66c86b320f72cc7
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -162,7 +162,7 @@ F src/os.h ae08bcc5f6ec6b339f4a2adf3931bb88cc14c3e4
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c 57306f1d2a2d783dae4365446b9f9a5da8958559
 F src/os_win.c e4f17ddf79f2a9373e33ed70565e765d65324589
-F src/pager.c 8ac98fd95106e759870e92ff316b188e78f469cf
+F src/pager.c 2b9980e87296812a6ce51121a3335550ae25e3ec
 F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1
 F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
@@ -1040,7 +1040,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P a850c7319c20b5757983443df05cf2aa4250053b
-R 211ffabed726a7468ad9f8d3eeabe8a8
-U dan
-Z 3ec7da7f1db0278991c8541b22037fbf
+P 30c0a69363931a72d1c34e5be71646932398d172
+R 11ebc3388f5e3939639a27582f5015a5
+U drh
+Z 2c5cf3d5be983a0c21f765acf3ca05b3

diff --git a/manifest.uuid b/manifest.uuid
index 12eaba33598fca7e4d5a7d5fdff180dab463ec1a..cd71ef1d3b08067c3369de4bf93156a2e6e184a0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-30c0a69363931a72d1c34e5be71646932398d172
\ No newline at end of file
+611bd824c24a60d298f28705de323fa2e813a308
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 65969bcc3e549f04866783c9d402ef7fc66897eb..550c6c7564102027cf2e2503cb3d7012924e8a91 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -659,7 +659,7 @@ struct Pager {
   u8 bUseFetch;               /* True to use xFetch() */
   int nMmapOut;               /* Number of mmap pages currently outstanding */
   sqlite3_int64 mxMmap;       /* Desired maximum mmap size */
-  PgHdr *pFree;               /* List of free mmap page headers (pDirty) */
+  PgHdr *pMmapFreelist;       /* List of free mmap page headers (pDirty) */
   /*
   ** End of the routinely-changing class members
   ***************************************************************************/
@@ -3854,9 +3854,9 @@ static int pagerAcquireMapPage(
 ){
   PgHdr *p;                       /* Memory mapped page to return */
 
-  if( pPager->pFree ){
-    *ppPage = p = pPager->pFree;
-    pPager->pFree = p->pDirty;
+  if( pPager->pMmapFreelist ){
+    *ppPage = p = pPager->pMmapFreelist;
+    pPager->pMmapFreelist = p->pDirty;
     p->pDirty = 0;
     memset(p->pExtra, 0, pPager->nExtra);
   }else{
@@ -3891,20 +3891,20 @@ static int pagerAcquireMapPage(
 static void pagerReleaseMapPage(PgHdr *pPg){
   Pager *pPager = pPg->pPager;
   pPager->nMmapOut--;
-  pPg->pDirty = pPager->pFree;
-  pPager->pFree = pPg;
+  pPg->pDirty = pPager->pMmapFreelist;
+  pPager->pMmapFreelist = pPg;
 
   assert( pPager->fd->pMethods->iVersion>=3 );
   sqlite3OsUnfetch(pPager->fd, (i64)(pPg->pgno-1)*pPager->pageSize, pPg->pData);
 }
 
 /*
-** Free all PgHdr objects stored in the Pager.pFree list.
+** Free all PgHdr objects stored in the Pager.pMmapFreelist list.
 */
 static void pagerFreeMapHdrs(Pager *pPager){
   PgHdr *p;
   PgHdr *pNext;
-  for(p=pPager->pFree; p; p=pNext){
+  for(p=pPager->pMmapFreelist; p; p=pNext){
     pNext = p->pDirty;
     sqlite3_free(p);
   }