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

Timestamp:

May 12, 2009 7:56:07 AM (16 years ago)

Author:

vboxsync

Message:

Split up PDM.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (1 diff)
• PDMCritSect.cpp (modified) (2 diffs)
• PDMInternal.h (modified) (3 diffs)
• VMM.cpp (modified) (2 diffs)
• VMMAll/PDMAllCritSect.cpp (modified) (1 diff)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -3256 +3256 @@
 static int emR3HighPriorityPostForcedActions(PVM pVM, PVMCPU pVCpu, int rc)
 {
-    if (VM_FF_ISPENDING(pVM, VM_FF_PDM_CRITSECT))
-        PDMR3CritSectFF(pVM);
+    if (VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_PDM_CRITSECT))
+        PDMR3CritSectFF(pVCpu);
 
     if (VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_CSAM_PENDING_ACTION))

trunk/src/VBox/VMM/PDMCritSect.cpp

@@ -295 +295 @@
  * Process the critical sections queued for ring-3 'leave'.
  *
- * @param   pVM         The VM handle.
- */
-VMMR3DECL(void) PDMR3CritSectFF(PVM pVM)
-{
-    Assert(pVM->pdm.s.cQueuedCritSectLeaves > 0);
-
-    const RTUINT c = pVM->pdm.s.cQueuedCritSectLeaves;
+ * @param   pVCpu         The VMCPU handle.
+ */
+VMMR3DECL(void) PDMR3CritSectFF(PVMCPU pVCpu)
+{
+    Assert(pVCpu->pdm.s.cQueuedCritSectLeaves > 0);
+
+    const RTUINT c = pVCpu->pdm.s.cQueuedCritSectLeaves;
     for (RTUINT i = 0; i < c; i++)
     {
-        PPDMCRITSECT pCritSect = pVM->pdm.s.apQueuedCritSectsLeaves[i];
+        PPDMCRITSECT pCritSect = pVCpu->pdm.s.apQueuedCritSectsLeaves[i];
         int rc = RTCritSectLeave(&pCritSect->s.Core);
         LogFlow(("PDMR3CritSectFF: %p - %Rrc\n", pCritSect, rc));
@@ -310 +310 @@
     }
 
-    pVM->pdm.s.cQueuedCritSectLeaves = 0;
-    VM_FF_CLEAR(pVM, VM_FF_PDM_CRITSECT);
+    pVCpu->pdm.s.cQueuedCritSectLeaves = 0;
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_PDM_CRITSECT);
 }
 

trunk/src/VBox/VMM/PDMInternal.h

@@ -797 +797 @@
 typedef struct PDMASYNCCOMPLETIONMANAGER *PPDMASYNCCOMPLETIONMANAGER;
 
+
+/**
+ * PDM VMCPU Instance data.
+ * Changes to this must checked against the padding of the cfgm union in VMCPU!
+ */
+typedef struct PDMCPU
+{
+    /** The number of entries in the apQueuedCritSectsLeaves table that's currnetly in use. */
+    RTUINT                          cQueuedCritSectLeaves;
+    RTUINT                          uPadding0; /**< Alignment padding.*/
+    /** Critical sections queued in RC/R0 because of contention preventing leave to complete. (R3 Ptrs)
+     * We will return to Ring-3 ASAP, so this queue doesn't have to be very long. */
+    R3PTRTYPE(PPDMCRITSECT)         apQueuedCritSectsLeaves[8];
+} PDMCPU;
+
 /**
  * Converts a PDM pointer into a VM pointer.
@@ -850 +865 @@
     RCPTRTYPE(PPDMQUEUE)            pDevHlpQueueRC;
 
-    /** The number of entries in the apQueuedCritSectsLeaves table that's currnetly in use. */
-    RTUINT                          cQueuedCritSectLeaves;
-    /** Critical sections queued in RC/R0 because of contention preventing leave to complete. (R3 Ptrs)
-     * We will return to Ring-3 ASAP, so this queue doesn't have to be very long. */
-    R3PTRTYPE(PPDMCRITSECT)         apQueuedCritSectsLeaves[8];
+    RTUINT                          uPadding1; /**< Alignment padding. */
 
     /** Linked list of timer driven PDM queues. */
@@ -867 +878 @@
     RCPTRTYPE(struct PDMQUEUE *)    pQueueFlushRC;
 #if HC_ARCH_BITS == 64
-    RTRCPTR                         padding0;
+    RTRCPTR                         uPadding2;
 #endif
 

trunk/src/VBox/VMM/VMM.cpp

@@ -1687 +1687 @@
     PRINT_FLAG(VM_FF_,PDM_QUEUES);
     PRINT_FLAG(VM_FF_,PDM_DMA);
-    PRINT_FLAG(VM_FF_,PDM_CRITSECT);
     PRINT_FLAG(VM_FF_,DBGF);
     PRINT_FLAG(VM_FF_,REQUEST);
@@ -1728 +1727 @@
         PRINT_FLAG(VMCPU_FF_,INTERRUPT_APIC);
         PRINT_FLAG(VMCPU_FF_,INTERRUPT_PIC);
+        PRINT_FLAG(VMCPU_FF_,PDM_CRITSECT);
         PRINT_FLAG(VMCPU_FF_,PGM_SYNC_CR3);
         PRINT_FLAG(VMCPU_FF_,PGM_SYNC_CR3_NON_GLOBAL);

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

@@ -253 +253 @@
      * Queue the request.
      */
-    RTUINT i = pVM->pdm.s.cQueuedCritSectLeaves++;
+    RTUINT i = pVCpu->pdm.s.cQueuedCritSectLeaves++;
     LogFlow(("PDMCritSectLeave: [%d]=%p => R3\n", i, pCritSect));
-    AssertFatal(i < RT_ELEMENTS(pVM->pdm.s.apQueuedCritSectsLeaves));
-    pVM->pdm.s.apQueuedCritSectsLeaves[i] = MMHyperCCToR3(pVM, pCritSect);
-    VM_FF_SET(pVM, VM_FF_PDM_CRITSECT);
+    AssertFatal(i < RT_ELEMENTS(pVCpu->pdm.s.apQueuedCritSectsLeaves));
+    pVCpu->pdm.s.apQueuedCritSectsLeaves[i] = MMHyperCCToR3(pVM, pCritSect);
+    VMCPU_FF_SET(pVCpu, VMCPU_FF_PDM_CRITSECT);
     VMCPU_FF_SET(pVCpu, VMCPU_FF_TO_R3);
     STAM_REL_COUNTER_INC(&pVM->pdm.s.StatQueuedCritSectLeaves);

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -332 +332 @@
     GEN_CHECK_OFF(PDM, pDevHlpQueueR0);
     GEN_CHECK_OFF(PDM, pDevHlpQueueRC);
-    GEN_CHECK_OFF(PDM, cQueuedCritSectLeaves);
-    GEN_CHECK_OFF(PDM, apQueuedCritSectsLeaves);
+    GEN_CHECK_OFF(PDMCPU, cQueuedCritSectLeaves);
+    GEN_CHECK_OFF(PDMCPU, apQueuedCritSectsLeaves);
     GEN_CHECK_OFF(PDM, pQueuesTimer);
     GEN_CHECK_OFF(PDM, pQueuesForced);