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

Timestamp:

Feb 23, 2010 4:12:09 PM (15 years ago)

Author:

vboxsync

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

57963

Message:

Updates & fixes

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (2 diffs)
• PGMInternal.h (modified) (2 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -1579 +1579 @@
     STAM_REL_REG(pVM, &pPGM->ChunkR3Map.cMax,                    STAMTYPE_U32,     "/PGM/ChunkR3Map/cMax",               STAMUNIT_COUNT,     "Maximum number of mapped chunks.");
 
+    STAM_REL_REG(pVM, &pPGM->StatLargePageAlloc,                 STAMTYPE_COUNTER, "/PGM/LargePage/Alloc",               STAMUNIT_OCCURENCES, "The number of large pages we've used.");
+    STAM_REL_REG(pVM, &pPGM->StatLargePageReused,                STAMTYPE_COUNTER, "/PGM/LargePage/Reused",              STAMUNIT_OCCURENCES, "The number of times we've reused a large page.");
+    STAM_REL_REG(pVM, &pPGM->StatLargePageRefused,               STAMTYPE_COUNTER, "/PGM/LargePage/Refused",             STAMUNIT_OCCURENCES, "The number of times we couldn't use a large page.");
+
     /* Live save */
     STAM_REL_REG_USED(pVM, &pPGM->LiveSave.fActive,              STAMTYPE_U8,      "/PGM/LiveSave/fActive",              STAMUNIT_COUNT,     "Active or not.");
@@ -1612 +1616 @@
         rc = STAMR3RegisterF(pVM, a, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, c, b); \
         AssertRC(rc);
-
-    PGM_REG_COUNTER(&pPGM->StatLargePageUsed,                 "/PGM/LargePage/Alloc",               "The number of large pages we've used.");
-    PGM_REG_COUNTER(&pPGM->StatLargePageRefused,              "/PGM/LargePage/Refused",             "The number of times we couldn't use a large page.");
 
     PGM_REG_COUNTER(&pPGM->StatR3DetectedConflicts,           "/PGM/R3/DetectedConflicts",          "The number of times PGMR3CheckMappingConflicts() detected a conflict.");

trunk/src/VBox/VMM/PGMInternal.h

@@ -2776 +2776 @@
     /** The number of times we were forced to change the hypervisor region location. */
     STAMCOUNTER                     cRelocations;
+
+    STAMCOUNTER                     StatLargePageAlloc;                 /**< The number of large pages we've allocated.*/
+    STAMCOUNTER                     StatLargePageReused;                /**< The number of large pages we've reused.*/
+    STAMCOUNTER                     StatLargePageRefused;               /**< The number of times we couldn't use a large page.*/
     /** @} */
 
 #ifdef VBOX_WITH_STATISTICS /** @todo move this chunk to the heap.  */
-    STAMCOUNTER StatLargePageUsed;                  /**< The number of large pages we've used.*/
-    STAMCOUNTER StatLargePageRefused;               /**< The number of times we couldn't use a large page.*/
-
     /* R3 only: */
     STAMCOUNTER StatR3DetectedConflicts;            /**< R3: Number of times PGMR3MapHasConflicts() detected a conflict. */
@@ -3321 +3322 @@
 
 int             pgmPhysAllocPage(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys);
-int             pgmPhysAllocLargePage(PVM pVM, RTGCPHYS GCPhys, RTHCPHYS *pHCPhys);
+int             pgmPhysAllocLargePage(PVM pVM, RTGCPHYS GCPhys);
 int             pgmPhysPageLoadIntoTlb(PPGM pPGM, RTGCPHYS GCPhys);
 int             pgmPhysPageLoadIntoTlbWithPage(PPGM pPGM, PPGMPAGE pPage, RTGCPHYS GCPhys);

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

@@ -521 +521 @@
             {
                 /* Failed. Mark as requiring a PT so we don't check the whole thing again in the future. */
-                STAM_COUNTER_INC(&pVM->pgm.s.StatLargePageRefused);
+                STAM_REL_COUNTER_INC(&pVM->pgm.s.StatLargePageRefused);
                 PGM_PAGE_SET_PDE_TYPE(pPage, PGM_PAGE_PDE_TYPE_PT);
                 return VERR_PGM_INVALID_LARGE_PAGE_RANGE;
@@ -535 +535 @@
                 {   
                     Assert(PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_ALLOCATED);
-                    STAM_COUNTER_INC(&pVM->pgm.s.StatLargePageUsed);
+                    STAM_REL_COUNTER_INC(&pVM->pgm.s.StatLargePageAlloc);
                     return VINF_SUCCESS;
                 }