Changeset 31800 in vbox

Timestamp:

Aug 19, 2010 6:15:07 PM (14 years ago)

Author:

vboxsync

Message:

PGMRZDynMap.cpp: Disabled totally bogus code that would flush the current subset when running low on mapping entries. More assertions.

File:

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

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

@@ -1949 +1949 @@
     uint32_t cEntries = pSet->cEntries;
     AssertReturnVoid(cEntries != PGMMAPSET_CLOSED);
+    Assert(pSet->iSubset == UINT32_MAX);
 #ifdef IN_RC
     if (RT_ELEMENTS(pSet->aEntries) > MM_HYPER_DYNAMIC_SIZE / PAGE_SIZE)
@@ -2097 +2098 @@
     STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->StatRZDynMapSubsets);
 
+    AssertMsg(iPrevSubset <= pSet->iSubset || iPrevSubset == UINT32_MAX, ("iPrevSubset=%#x iSubset=%#x\n", iPrevSubset, pSet->iSubset));
     return iPrevSubset;
 }
@@ -2113 +2115 @@
     LogFlow(("PGMRZDynMapPopAutoSubset: pVCpu=%p iPrevSubset=%u iSubset=%u cEntries=%u\n", pVCpu, iPrevSubset, pSet->iSubset, cEntries));
     AssertReturnVoid(cEntries != PGMMAPSET_CLOSED);
-    AssertReturnVoid(pSet->iSubset >= iPrevSubset || iPrevSubset == UINT32_MAX);
+    AssertMsgReturnVoid(pSet->iSubset >= iPrevSubset || iPrevSubset == UINT32_MAX, ("iPrevSubset=%u iSubset=%u cEntries=%u\n", iPrevSubset, pSet->iSubset, cEntries));
 #ifdef IN_RC
     if (RT_ELEMENTS(pSet->aEntries) > MM_HYPER_DYNAMIC_SIZE / PAGE_SIZE)
@@ -2125 +2127 @@
         AssertMsg(cEntries < PGMMAPSET_MAX_FILL, ("%u\n", cEntries));
         pgmDynMapFlushSubset(pSet);
+        Assert(pSet->cEntries >= iPrevSubset || iPrevSubset == UINT32_MAX);
     }
     pSet->iSubset = iPrevSubset;
@@ -2372 +2375 @@
         {
             STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->StatRZDynMapSetSearchMisses);
+#if 0 /* this is very bogus */
             if (pSet->iSubset < pSet->cEntries)
             {
@@ -2379 +2383 @@
                 pgmDynMapFlushSubset(pSet);
             }
+#endif
 
             if (RT_UNLIKELY(pSet->cEntries >= RT_ELEMENTS(pSet->aEntries)))