Changeset 31834 in vbox

Timestamp:

Aug 21, 2010 12:52:39 AM (15 years ago)

Author:

vboxsync

Message:

PGMRZDynMap.cpp: Dropped the PGMMAPSET_MAX_FILL checks and instead make sure we can optimize the better.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• VMMRZ/PGMRZDynMap.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -1800 +1800 @@
 /** Hash function for aiHashTable. */
 #define PGMMAPSET_HASH(HCPhys)      (((HCPhys) >> PAGE_SHIFT) & 127)
-
-/** The max fill size (strict builds). */
-#define PGMMAPSET_MAX_FILL          (64U * 80U / 100U)
 
 

trunk/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp

@@ -1924 +1924 @@
 #endif
         STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->aStatRZDynMapSetFilledPct[(cEntries * 10 / RT_ELEMENTS(pSet->aEntries)) % 11]);
-    AssertMsg(cEntries < PGMMAPSET_MAX_FILL, ("%u\n", cEntries));
     if (cEntries > RT_ELEMENTS(pSet->aEntries) * 50 / 100)
         Log(("PGMRZDynMapReleaseAutoSet: cEntries=%d\n", cEntries));
@@ -1959 +1958 @@
     {
         pSet->cEntries = 0;
-
-        AssertMsg(cEntries < PGMMAPSET_MAX_FILL, ("%u\n", cEntries));
         Log(("PGMDynMapFlushAutoSet: cEntries=%d\n", pSet->cEntries));
 
@@ -2086 +2083 @@
     LogFlow(("PGMRZDynMapPushAutoSubset: pVCpu=%p iPrevSubset=%u\n", pVCpu, iPrevSubset));
 
+    /*
+     * If it looks like we're approaching the max set size or mapping space
+     * optimize the set to drop off unused pages.
+     */
+    if (   pSet->cEntries > RT_ELEMENTS(pSet->aEntries) * 60 / 100
 #ifdef IN_RC
-    /* kludge */
-    if (pSet->cEntries > MM_HYPER_DYNAMIC_SIZE / PAGE_SIZE / 2)
+        || pSet->cEntries > MM_HYPER_DYNAMIC_SIZE / PAGE_SIZE / 2  /** @todo need to do this for r0 as well.*/
+#endif
+        )
     {
         STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->StatRZDynMapSetOptimize);
         pgmDynMapOptimizeAutoSet(pSet);
     }
-#endif
 
     pSet->iSubset = pSet->cEntries;
@@ -2125 +2127 @@
         &&  cEntries != pSet->iSubset)
     {
-        AssertMsg(cEntries < PGMMAPSET_MAX_FILL, ("%u\n", cEntries));
         pgmDynMapFlushSubset(pSet);
         Assert(pSet->cEntries >= iPrevSubset || iPrevSubset == UINT32_MAX);
@@ -2380 +2381 @@
                 STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->StatRZDynMapSetSearchFlushes);
                 STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->aStatRZDynMapSetFilledPct[(pSet->cEntries * 10 / RT_ELEMENTS(pSet->aEntries)) % 11]);
-                AssertMsg(pSet->cEntries < PGMMAPSET_MAX_FILL, ("%u\n", pSet->cEntries));
                 pgmDynMapFlushSubset(pSet);
             }