Changeset 20665 in vbox

Timestamp:

Jun 17, 2009 12:59:58 PM (16 years ago)

Author:

vboxsync

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

48760

Message:

PGMAllPool.cpp: Use VMMR3EmtRendezvous to avoid whatever issue there is with VMMR3AtomicExecuteHandler that caused me to be stuck in it without the other EMT noticing.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (4 diffs)

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

@@ -1961 +1961 @@
  * @returns VBox status code.
  * @param   pVM     The VM handle.
- * @param   pvUser  Unused parameter
+ * @param   pVCpu   The VMCPU for the EMT we're being called on. Unused.
+ * @param   pvUser  Unused parameter.
+ *
  * @remark  Should only be used when monitoring is available, thus placed in
- *          the PGMPOOL_WITH_MONITORING #ifdef.
- */
-DECLCALLBACK(int) pgmPoolClearAll(PVM pVM, void *pvUser)
-{
-    NOREF(pvUser);
+ *          the PGMPOOL_WITH_MONITORING \#ifdef.
+ */
+DECLCALLBACK(int) pgmPoolClearAll(PVM pVM, PVMCPU pVCpu, void *pvUser)
+{
     PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
     STAM_PROFILE_START(&pPool->StatClearAll, c);
     LogFlow(("pgmPoolClearAll: cUsedPages=%d\n", pPool->cUsedPages));
+    NOREF(pvUser); NOREF(pVCpu);
 
     pgmLock(pVM);
@@ -2109 +2111 @@
     PVM pVM = pVCpu->CTX_SUFF(pVM);
     LogFlow(("pgmPoolSyncCR3\n"));
+
     /*
      * When monitoring shadowed pages, we reset the modification counters on CR3 sync.
@@ -2118 +2121 @@
     if (ASMBitTestAndClear(&pVCpu->pgm.s.fSyncFlags, PGM_SYNC_CLEAR_PGM_POOL_BIT))
     {
-        VMMR3AtomicExecuteHandler(pVM, pgmPoolClearAll, NULL);
+        int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, pgmPoolClearAll, NULL);
+        AssertRC(rc);
+    }
 # else  /* !IN_RING3 */
     if (pVCpu->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL)
@@ -2125 +2130 @@
         VMCPU_FF_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3); /** @todo no need to do global sync, right? */
         return VINF_PGM_SYNC_CR3;
+    }
 # endif /* !IN_RING3 */
-    }
     else
         pgmPoolMonitorModifiedClearAll(pVM);