Changeset 12983 in vbox

Timestamp:

Oct 4, 2008 10:17:38 PM (16 years ago)

Author:

vboxsync

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

37416

Message:

#1865: PDMCritSect.

Location:

trunk

Files:

• include/VBox/pdmcritsect.h (modified) (1 diff)
• src/VBox/VMM/PDMCritSect.cpp (modified) (6 diffs)
• src/VBox/VMM/PDMInternal.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/PDMAllCritSect.cpp (modified) (6 diffs)
• src/VBox/VMM/testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/include/VBox/pdmcritsect.h

@@ -59 +59 @@
 typedef const PDMCRITSECT *PCPDMCRITSECT;
 
-/**
- * Initializes a PDM critical section for internal use.
- *
- * The PDM critical sections are derived from the IPRT critical sections, but
- * works in GC as well.
- *
- * @returns VBox status code.
- * @param   pVM             The VM handle.
- * @param   pDevIns         Device instance.
- * @param   pCritSect       Pointer to the critical section.
- * @param   pszName         The name of the critical section (for statistics).
- */
-PDMR3DECL(int) PDMR3CritSectInit(PVM pVM, PPDMCRITSECT pCritSect, const char *pszName);
-
-/**
- * Enters a PDM critical section.
- *
- * @returns VINF_SUCCESS if entered successfully.
- * @returns rcBusy when encountering a busy critical section in GC/R0.
- * @returns VERR_SEM_DESTROYED if the critical section is dead.
- *
- * @param   pCritSect           The PDM critical section to enter.
- * @param   rcBusy              The status code to return when we're in GC or R0
- *                              and the section is busy.
- */
-PDMDECL(int) PDMCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy);
-
-/**
- * Enters a PDM critical section.
- *
- * @returns VINF_SUCCESS if entered successfully.
- * @returns rcBusy when encountering a busy critical section in GC/R0.
- * @returns VERR_SEM_DESTROYED if the critical section is dead.
- *
- * @param   pCritSect           The PDM critical section to enter.
- * @param   fCallHost           Whether this is a VMMGCCallHost() or VMMR0CallHost() request.
- */
-PDMR3DECL(int) PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallHost);
-
-/**
- * Leaves a critical section entered with PDMCritSectEnter().
- *
- * @param   pCritSect           The PDM critical section to leave.
- */
-PDMDECL(void) PDMCritSectLeave(PPDMCRITSECT pCritSect);
-
-/**
- * Checks the caller is the owner of the critical section.
- *
- * @returns true if owner.
- * @returns false if not owner.
- * @param   pCritSect   The critical section.
- */
-PDMDECL(bool) PDMCritSectIsOwner(PCPDMCRITSECT pCritSect);
-
-/**
- * Checks if a critical section is initialized or not.
- *
- * @returns true if initialized.
- * @returns false if not initialized.
- * @param   pCritSect   The critical section.
- */
-PDMDECL(bool) PDMCritSectIsInitialized(PCPDMCRITSECT pCritSect);
-
-/**
- * Try enter a critical section.
- *
- * @returns VINF_SUCCESS on success.
- * @returns VERR_SEM_BUSY if the critsect was owned.
- * @returns VERR_SEM_NESTED if nested enter on a no nesting section. (Asserted.)
- * @returns VERR_SEM_DESTROYED if RTCritSectDelete was called while waiting.
- * @param   pCritSect   The critical section.
- */
-PDMR3DECL(int) PDMR3CritSectTryEnter(PPDMCRITSECT pCritSect);
-
-/**
- * Schedule a event semaphore for signalling upon critsect exit.
- *
- * @returns VINF_SUCCESS on success.
- * @returns VERR_TOO_MANY_SEMAPHORES if an event was already scheduled.
- * @returns VERR_NOT_OWNER if we're not the critsect owner.
- * @returns VERR_SEM_DESTROYED if RTCritSectDelete was called while waiting.
- * @param   pCritSect       The critical section.
- * @param   EventToSignal     The semapore that should be signalled.
- */
-PDMR3DECL(int) PDMR3CritSectScheduleExitEvent(PPDMCRITSECT pCritSect, RTSEMEVENT EventToSignal);
-
-/**
- * Deletes the critical section.
- *
- * @returns VBox status code.
- * @param   pCritSect           The PDM critical section to destroy.
- */
-PDMR3DECL(int) PDMR3CritSectDelete(PPDMCRITSECT pCritSect);
-
-/**
- * Deletes all remaining critical sections.
- *
- * This is called at the end of the termination process.
- *
- * @returns VBox status.
- *          First error code, rest is lost.
- * @param   pVM         The VM handle.
- * @remark  Don't confuse this with PDMR3CritSectDelete.
- */
-PDMDECL(int) PDMR3CritSectTerm(PVM pVM);
-
-/**
- * Process the critical sections queued for ring-3 'leave'.
- *
- * @param   pVM         The VM handle.
- */
+PDMR3DECL(int)  PDMR3CritSectInit(PVM pVM, PPDMCRITSECT pCritSect, const char *pszName);
+PDMDECL(int)    PDMCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy);
+PDMR3DECL(int)  PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallHost);
+PDMDECL(void)   PDMCritSectLeave(PPDMCRITSECT pCritSect);
+PDMDECL(bool)   PDMCritSectIsOwner(PCPDMCRITSECT pCritSect);
+PDMDECL(bool)   PDMCritSectIsInitialized(PCPDMCRITSECT pCritSect);
+PDMR3DECL(int)  PDMR3CritSectTryEnter(PPDMCRITSECT pCritSect);
+PDMR3DECL(int)  PDMR3CritSectScheduleExitEvent(PPDMCRITSECT pCritSect, RTSEMEVENT EventToSignal);
+PDMR3DECL(int)  PDMR3CritSectDelete(PPDMCRITSECT pCritSect);
+PDMDECL(int)    PDMR3CritSectTerm(PVM pVM);
 PDMR3DECL(void) PDMR3CritSectFF(PVM pVM);
 

trunk/src/VBox/VMM/PDMCritSect.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * PDM Critical Sections
+ * PDM - Critical Sections, Ring-3.
  */
 
@@ -19 +19 @@
  * additional information or have any questions.
  */
-
 
 
@@ -71 +70 @@
          pCur;
          pCur = pCur->pNext)
-        pCur->pVMGC = pVM->pVMGC;
+        pCur->pVMRC = pVM->pVMRC;
 }
 
@@ -117 +116 @@
         pCritSect->pVMR3 = pVM;
         pCritSect->pVMR0 = (RTR0PTR)pVM;//pVM->pVMR0;
-        pCritSect->pVMGC = pVM->pVMGC;
+        pCritSect->pVMRC = pVM->pVMRC;
         pCritSect->pvKey = pvKey;
         pCritSect->EventToSignal = NIL_RTSEMEVENT;
@@ -123 +122 @@
         pVM->pdm.s.pCritSects = pCritSect;
 #ifdef VBOX_WITH_STATISTICS
-        STAMR3RegisterF(pVM, &pCritSect->StatContentionR0GCLock,   STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionR0GCLock", pszName);
-        STAMR3RegisterF(pVM, &pCritSect->StatContentionR0GCUnlock, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionR0GCUnlock", pszName);
-        STAMR3RegisterF(pVM, &pCritSect->StatContentionR3,         STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionR3", pszName);
-        STAMR3RegisterF(pVM, &pCritSect->StatLocked,           STAMTYPE_PROFILE_ADV, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_OCCURENCE, NULL, "/PDM/CritSects/%s/Locked", pszName);
+        STAMR3RegisterF(pVM, &pCritSect->StatContentionRZLock,  STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionRZLock", pszName);
+        STAMR3RegisterF(pVM, &pCritSect->StatContentionRZUnlock,STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionRZUnlock", pszName);
+        STAMR3RegisterF(pVM, &pCritSect->StatContentionR3,      STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionR3", pszName);
+        STAMR3RegisterF(pVM, &pCritSect->StatLocked,        STAMTYPE_PROFILE_ADV, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_OCCURENCE, NULL, "/PDM/CritSects/%s/Locked", pszName);
 #endif
     }
@@ -191 +190 @@
     /* delete */
     pCritSect->pNext = NULL;
-    pCritSect->pVMGC = 0;
+    pCritSect->pvKey = NULL;
     pCritSect->pVMR3 = NULL;
     pCritSect->pVMR0 = NIL_RTR0PTR;
-    pCritSect->pvKey = NULL;
+    pCritSect->pVMRC = NIL_RTRCPTR;
 #ifdef VBOX_WITH_STATISTICS
     if (!fFinal)
     {
-        STAMR3Deregister(pVM, &pCritSect->StatContentionR0GCLock);
-        STAMR3Deregister(pVM, &pCritSect->StatContentionR0GCUnlock);
+        STAMR3Deregister(pVM, &pCritSect->StatContentionRZLock);
+        STAMR3Deregister(pVM, &pCritSect->StatContentionRZUnlock);
         STAMR3Deregister(pVM, &pCritSect->StatContentionR3);
         STAMR3Deregister(pVM, &pCritSect->StatLocked);

trunk/src/VBox/VMM/PDMInternal.h

@@ -196 +196 @@
     RTCRITSECT                      Core;
     /** Pointer to the next critical section.
-     * This chain is used for relocating pVMGC and device cleanup. */
+     * This chain is used for relocating pVMRC and device cleanup. */
     R3PTRTYPE(struct PDMCRITSECTINT *) pNext;
     /** Owner identifier.
@@ -203 +203 @@
     RTR3PTR                         pvKey;
     /** Pointer to the VM - R3Ptr. */
-    R3PTRTYPE(PVM)                  pVMR3;
+    PVMR3                           pVMR3;
     /** Pointer to the VM - R0Ptr. */
-    R0PTRTYPE(PVM)                  pVMR0;
+    PVMR0                           pVMR0;
     /** Pointer to the VM - GCPtr. */
-    RCPTRTYPE(PVM)                  pVMGC;
+    PVMRC                           pVMRC;
 #if HC_ARCH_BITS == 64
-    uint32_t            padding;
+    RTRCPTR                         padding;
 #endif
     /** Event semaphore that is scheduled to be signaled upon leaving the
      * critical section. This is Ring-3 only of course. */
     RTSEMEVENT                      EventToSignal;
-    /** R0/GC lock contention. */
-    STAMCOUNTER                     StatContentionR0GCLock;
-    /** R0/GC unlock contention. */
-    STAMCOUNTER                     StatContentionR0GCUnlock;
+    /** R0/RC lock contention. */
+    STAMCOUNTER                     StatContentionRZLock;
+    /** R0/RC unlock contention. */
+    STAMCOUNTER                     StatContentionRZUnlock;
     /** R3 lock contention. */
     STAMCOUNTER                     StatContentionR3;
     /** Profiling the time the section is locked. */
     STAMPROFILEADV                  StatLocked;
-} PDMCRITSECTINT, *PPDMCRITSECTINT;
+} PDMCRITSECTINT;
+typedef PDMCRITSECTINT *PPDMCRITSECTINT;
 
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * PDM Critical Sections
+ * PDM - Critical Sections, All Contexts.
  */
 
@@ -61 +61 @@
     return rc;
 
-#else
+#else  /* !IN_RING3 */
     AssertMsgReturn(pCritSect->s.Core.u32Magic == RTCRITSECT_MAGIC, ("%RX32\n", pCritSect->s.Core.u32Magic),
                     VERR_SEM_DESTROYED);
-    PVM pVM = pCritSect->s.CTXALLSUFF(pVM);
+    PVM pVM = pCritSect->s.CTX_SUFF(pVM);
     Assert(pVM);
 
@@ -91 +91 @@
      * Failed.
      */
-    LogFlow(("PDMCritSectEnter: locked => HC (%Vrc)\n", rcBusy));
-    STAM_COUNTER_INC(&pCritSect->s.StatContentionR0GCLock);
+    LogFlow(("PDMCritSectEnter: locked => R3 (%Vrc)\n", rcBusy));
+    STAM_COUNTER_INC(&pCritSect->s.StatContentionRZLock);
     return rcBusy;
-#endif
+#endif /* !IN_RING3 */
 }
 
@@ -157 +157 @@
     Assert(pCritSect->s.Core.cNestings > 0);
     Assert(pCritSect->s.Core.cLockers >= 0);
-    PVM pVM = pCritSect->s.CTXALLSUFF(pVM);
+    PVM pVM = pCritSect->s.CTX_SUFF(pVM);
     Assert(pVM);
     Assert(pCritSect->s.Core.NativeThreadOwner == pVM->NativeThreadEMT);
@@ -198 +198 @@
     VM_FF_SET(pVM, VM_FF_TO_R3);
     STAM_COUNTER_INC(&pVM->pdm.s.StatQueuedCritSectLeaves);
-    STAM_COUNTER_INC(&pCritSect->s.StatContentionR0GCUnlock);
-#endif
+    STAM_COUNTER_INC(&pCritSect->s.StatContentionRZUnlock);
+#endif /* !IN_RING3 */
 }
 
@@ -215 +215 @@
     return RTCritSectIsOwner(&pCritSect->s.Core);
 #else
-    PVM pVM = pCritSect->s.CTXALLSUFF(pVM);
+    PVM pVM = pCritSect->s.CTX_SUFF(pVM);
     Assert(pVM);
     return pCritSect->s.Core.NativeThreadOwner == pVM->NativeThreadEMT;

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

@@ -338 +338 @@
     GEN_CHECK_OFF(PDMCRITSECTINT, pVMR3);
     GEN_CHECK_OFF(PDMCRITSECTINT, pVMR0);
-    GEN_CHECK_OFF(PDMCRITSECTINT, pVMGC);
-    GEN_CHECK_OFF(PDMCRITSECTINT, StatContentionR0GCLock);
-    GEN_CHECK_OFF(PDMCRITSECTINT, StatContentionR0GCUnlock);
+    GEN_CHECK_OFF(PDMCRITSECTINT, pVMRC);
+    GEN_CHECK_OFF(PDMCRITSECTINT, StatContentionRZLock);
+    GEN_CHECK_OFF(PDMCRITSECTINT, StatContentionRZUnlock);
     GEN_CHECK_OFF(PDMCRITSECTINT, StatContentionR3);
     GEN_CHECK_OFF(PDMCRITSECTINT, StatLocked);