Changeset 24875 in vbox

Timestamp:

Nov 23, 2009 4:04:20 PM (15 years ago)

Author:

vboxsync

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

55136

Message:

pgmR3LiveVote: Take the current dirty page count into consideration and not only the averages.

File:

• trunk/src/VBox/VMM/PGMSavedState.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -1785 +1785 @@
     uint32_t const cWrittenToPages = pVM->pgm.s.cWrittenToPages;
     pgmUnlock(pVM);
+    uint32_t const cDirtyNow = pVM->pgm.s.LiveSave.Rom.cDirtyPages
+                             + pVM->pgm.s.LiveSave.Mmio2.cDirtyPages
+                             + pVM->pgm.s.LiveSave.Ram.cDirtyPages
+                             + cWrittenToPages;
     uint32_t i = pVM->pgm.s.LiveSave.iDirtyPagesHistory;
-    pVM->pgm.s.LiveSave.acDirtyPagesHistory[i] = pVM->pgm.s.LiveSave.Rom.cDirtyPages
-                                               + pVM->pgm.s.LiveSave.Mmio2.cDirtyPages
-                                               + pVM->pgm.s.LiveSave.Ram.cDirtyPages
-                                               + cWrittenToPages;
+    pVM->pgm.s.LiveSave.acDirtyPagesHistory[i] = cDirtyNow;
     pVM->pgm.s.LiveSave.iDirtyPagesHistory = (i + 1) % cHistoryEntries;
 
@@ -1821 +1822 @@
      * Try make a decision.
      */
-    if (cDirtyPagesShort <= cDirtyPagesLong)
+    if (    cDirtyPagesShort <= cDirtyPagesLong
+        &&  (   cDirtyNow    <= cDirtyPagesShort
+             || cDirtyNow - cDirtyPagesShort < cDirtyPagesShort / 8
+            )
+       )
     {
         if (uPass > 10)