Changeset 23535 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 4, 2009 1:33:03 PM (15 years ago)

Author:

vboxsync

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

53178

Message:

PGMSavedState: More statistics.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• PGMSavedState.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -2719 +2719 @@
             /** The number of dirty pages. */
             uint32_t                cDirtyPages;
+            /** The number of ready zero pages.  */
+            uint32_t                cZeroPages;
+            /** The number of write monitored pages. */
+            uint32_t                cMonitoredPages;
         }                           Rom,
                                     Mmio2,
                                     Ram;
-        /** The number of monitored pages. */
-        uint32_t                    cMonitoredPages;
-        /** The number of ignored pages.  */
+        /** The number of ignored pages in the RAM ranges (i.e. MMIO, MMIO2 and ROM). */
         uint32_t                    cIgnoredPages;
         /** Indicates that a live save operation is active.  */
         bool                        fActive;
         /** Padding. */
-        bool                        afReserved[4+3];
+        bool                        afReserved[3];
     } LiveSave;
 

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -1156 +1156 @@
                                 {
                                     Assert(!paLSPages[iPage].fWriteMonitored);
-                                    pVM->pgm.s.LiveSave.cMonitoredPages++;
+                                    pVM->pgm.s.LiveSave.Ram.cMonitoredPages++;
+                                    if (paLSPages[iPage].fZero)
+                                        pVM->pgm.s.LiveSave.Ram.cZeroPages--;
                                 }
 
@@ -1204 +1206 @@
                                         pVM->pgm.s.LiveSave.Ram.cDirtyPages++;
                                     }
+                                    pVM->pgm.s.LiveSave.Ram.cZeroPages++;
                                 }
                                 break;
@@ -1246 +1249 @@
                                 pVM->pgm.s.cWrittenToPages--;
                             }
-                            pVM->pgm.s.LiveSave.cMonitoredPages--;
+                            pVM->pgm.s.LiveSave.Ram.cMonitoredPages--;
                         }
 
@@ -1349 +1352 @@
                     int         rc;
                     RTGCPHYS    GCPhys = pCur->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT);
-
-                    if (!PGM_PAGE_IS_ZERO(&pCur->aPages[iPage]))
+                    bool        fZero  = PGM_PAGE_IS_ZERO(&pCur->aPages[iPage]);
+
+                    if (!fZero)
                     {
                         /*
@@ -1399 +1403 @@
                         pVM->pgm.s.LiveSave.Ram.cReadyPages++;
                         pVM->pgm.s.LiveSave.Ram.cDirtyPages--;
+                        if (fZero)
+                            pVM->pgm.s.LiveSave.Ram.cZeroPages++;
                     }
                     if (idRamRangesGen != pVM->pgm.s.idRamRangesGen)
@@ -1538 +1544 @@
 }
 
-//#include <iprt/stream.h>
+#include <iprt/stream.h>
 
 /**
@@ -1550 +1556 @@
 static DECLCALLBACK(int)  pgmR3LiveVote(PVM pVM, PSSMHANDLE pSSM)
 {
-#if 0
-    RTPrintf("# Ram R/D=%08x/%08x Ignored=%#08x Monitored=%#08x  Rom R/D=%08x/%08x  Mmio2 R/D=%08x/%08x\n",
+#if 1
+    RTPrintf("# Rom[R/D/Z/M]=%03x/%03x/%03x/%03x  Mmio2=%04x/%04x/%04x/%04x  Ram=%06x/%06x/%06x/%06x Ignored=%03x\n",
+             pVM->pgm.s.LiveSave.Rom.cReadyPages,
+             pVM->pgm.s.LiveSave.Rom.cDirtyPages,
+             pVM->pgm.s.LiveSave.Rom.cZeroPages,
+             pVM->pgm.s.LiveSave.Rom.cMonitoredPages,
+             pVM->pgm.s.LiveSave.Mmio2.cReadyPages,
+             pVM->pgm.s.LiveSave.Mmio2.cDirtyPages,
+             pVM->pgm.s.LiveSave.Mmio2.cZeroPages,
+             pVM->pgm.s.LiveSave.Mmio2.cMonitoredPages,
              pVM->pgm.s.LiveSave.Ram.cReadyPages,
              pVM->pgm.s.LiveSave.Ram.cDirtyPages,
-             pVM->pgm.s.LiveSave.cIgnoredPages,
-             pVM->pgm.s.LiveSave.cMonitoredPages,
-             pVM->pgm.s.LiveSave.Rom.cReadyPages,
-             pVM->pgm.s.LiveSave.Rom.cDirtyPages,
-             pVM->pgm.s.LiveSave.Mmio2.cReadyPages,
-             pVM->pgm.s.LiveSave.Mmio2.cDirtyPages
+             pVM->pgm.s.LiveSave.Ram.cZeroPages,
+             pVM->pgm.s.LiveSave.Ram.cMonitoredPages,
+             pVM->pgm.s.LiveSave.cIgnoredPages
              );
     static int s_iHack = 0;