Changeset 22504 in vbox

Timestamp:

Aug 27, 2009 10:17:04 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

51524

Message:

Updates for dirty page management (disabled code)

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -65 +65 @@
 static const char *pgmPoolPoolKindToStr(uint8_t enmKind);
 #endif
+static PPGMPOOLPAGE pgmPoolMonitorGetPageByGCPhys(PPGMPOOL pPool, PPGMPOOLPAGE pNewPage);
 
 void            pgmPoolTrackFlushGCPhysPT(PVM pVM, PPGMPAGE pPhysPage, uint16_t iShw, uint16_t cRefs);
@@ -250 +251 @@
     PVM pVM = pPool->CTX_SUFF(pVM);
 
-    LogFlow(("pgmPoolMonitorChainChanging: %RGv phys=%RGp kind=%s cbWrite=%d\n", (RTGCPTR)pvAddress, GCPhysFault, pgmPoolPoolKindToStr(pPage->enmKind), cbWrite));
+    LogFlow(("pgmPoolMonitorChainChanging: %RGv phys=%RGp cbWrite=%d\n", (RTGCPTR)pvAddress, GCPhysFault, cbWrite));
+
     for (;;)
     {
@@ -263 +265 @@
             PX86PML4    pPML4;
         } uShw;
+
+        LogFlow(("pgmPoolMonitorChainChanging: page idx=%d phys=%RGp (next=%d) kind=%s\n", pPage->idx, pPage->GCPhys, pPage->iMonitoredNext, pgmPoolPoolKindToStr(pPage->enmKind), cbWrite));
 
         uShw.pv = NULL;
@@ -1283 +1287 @@
         &&  pPage->enmKind == PGMPOOLKIND_PAE_PT_FOR_PAE_PT
         &&  pPage->cModifications >= cMaxModifications
-        &&  pPage->iModifiedNext == NIL_PGMPOOL_IDX
-        &&  pPage->iModifiedPrev == NIL_PGMPOOL_IDX)
+        &&  pPage->iMonitoredNext != NIL_PGMPOOL_IDX
+        &&  pPage->iMonitoredPrev != NIL_PGMPOOL_IDX)
     {
         Assert(!pgmPoolIsPageLocked(&pVM->pgm.s, pPage));
@@ -1395 +1399 @@
     pPage = &pPool->aPages[idxPage];
     Assert(pPage->idx == idxPage);
-    Assert(pPage->iModifiedNext == NIL_PGMPOOL_IDX && pPage->iModifiedPrev == NIL_PGMPOOL_IDX);
+    Assert(pPage->iMonitoredNext == NIL_PGMPOOL_IDX && pPage->iMonitoredPrev == NIL_PGMPOOL_IDX);
 
     AssertMsg(pPage->fDirty, ("Page %RGp (slot=%d) not marked dirty!", pPage->GCPhys, idxSlot));
@@ -1452 +1456 @@
     idxFree = pPool->idxFreeDirtyPage;
     Assert(idxFree < RT_ELEMENTS(pPool->aIdxDirtyPages));
-    Assert(pPage->iModifiedNext == NIL_PGMPOOL_IDX && pPage->iModifiedPrev == NIL_PGMPOOL_IDX);
+    Assert(pPage->iMonitoredNext == NIL_PGMPOOL_IDX && pPage->iMonitoredPrev == NIL_PGMPOOL_IDX);
 
     if (pPool->cDirtyPages >= RT_ELEMENTS(pPool->aIdxDirtyPages))
@@ -2069 +2073 @@
         Assert(pPageHead != pPage); Assert(pPageHead->iMonitoredNext != pPage->idx);
         Assert(pPageHead->iMonitoredPrev != pPage->idx);
+        Assert(pPageHead->iMonitoredPrev == NIL_PGMPOOL_IDX || pPool->aPages[pPageHead->iMonitoredPrev].GCPhys == pPage->GCPhys);
+        Assert(pPageHead->iMonitoredNext == NIL_PGMPOOL_IDX || pPool->aPages[pPageHead->iMonitoredNext].GCPhys == pPage->GCPhys);
 
 #ifdef PGMPOOL_WITH_OPTIMIZED_DIRTY_PT