Changeset 31838 in vbox for trunk

Timestamp:

Aug 21, 2010 1:19:56 AM (14 years ago)

Author:

vboxsync

Message:

PGMRZDynMap.cpp: better high load check in PGMRZDynMapPushAutoSubset and PGMRZDynMapFlushAutoSet.

File:

• trunk/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp (modified) (4 diffs)

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

@@ -254 +254 @@
     uint32_t                    cLoad;
     /** The max load ever.
-     * This is maintained to get trigger adding of more mapping space. */
+     * This is maintained to trigger the adding of more mapping space. */
     uint32_t                    cMaxLoad;
 # ifndef IN_RC
@@ -1865 +1865 @@
 
 /**
+ * Checks if the set has high load.
+ *
+ * @returns true on high load, otherwise false.
+ * @param   pSet            The set.
+ */
+DECLINLINE(bool) pgmRZDynMapHasHighLoad(PPGMMAPSET pSet)
+{
+#ifdef IN_RC
+    if (pSet->cEntries < MM_HYPER_DYNAMIC_SIZE / PAGE_SIZE / 2)
+        return false;
+#endif
+
+    PPGMRZDYNMAP pThis = PGMRZDYNMAP_SET_2_DYNMAP(pSet);
+    uint32_t cUnusedPages = pThis->cPages - pThis->cLoad;
+#ifdef IN_RC
+    return cUnusedPages <= MM_HYPER_DYNAMIC_SIZE / PAGE_SIZE * 36 / 100;
+#else
+    return cUnusedPages <= PGMR0DYNMAP_PAGES_PER_CPU_MIN;
+#endif
+}
+
+
+/**
  * Worker that performs the actual flushing of the set.
  *
@@ -1955 +1978 @@
 #endif
         STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->aStatRZDynMapSetFilledPct[(cEntries * 10 / RT_ELEMENTS(pSet->aEntries)) % 11]);
-    if (cEntries >= RT_ELEMENTS(pSet->aEntries) * 45 / 100)
+    if (   cEntries >= RT_ELEMENTS(pSet->aEntries) * 45 / 100
+        || pgmRZDynMapHasHighLoad(pSet))
     {
         pSet->cEntries = 0;
@@ -2088 +2112 @@
      */
     if (   pSet->cEntries > RT_ELEMENTS(pSet->aEntries) * 60 / 100
-#ifdef IN_RC
-        || pSet->cEntries > MM_HYPER_DYNAMIC_SIZE / PAGE_SIZE / 2  /** @todo need to do this for r0 as well.*/
-#endif
-        )
+        || pgmRZDynMapHasHighLoad(pSet))
     {
         STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->StatRZDynMapSetOptimize);