Changeset 19439 in vbox for trunk/src/VBox

Timestamp:

May 6, 2009 3:04:30 PM (16 years ago)

Author:

vboxsync

Message:

PDM: Renamed PDMR3CritSectTryEnter to PDMCritSectTryEnter.

Location:

trunk/src/VBox/VMM

Files:

• PDMCritSect.cpp (modified) (1 diff)
• VMMAll/PDMAllCritSect.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PDMCritSect.cpp

@@ -312 +312 @@
     pVM->pdm.s.cQueuedCritSectLeaves = 0;
     VM_FF_CLEAR(pVM, VM_FF_PDM_CRITSECT);
-}
-
-
-/**
- * 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.
- */
-VMMR3DECL(int) PDMR3CritSectTryEnter(PPDMCRITSECT pCritSect)
-{
-    return RTCritSectTryEnter(&pCritSect->s.Core);
 }
 

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

@@ -77 +77 @@
     {
         pCritSect->s.Core.cNestings = 1;
-        Assert(pVCpu->hNativeThread);
+        Assert(pVCpu->hNativeThread != NIL_RTNATIVETHREAD);
         ASMAtomicXchgSize(&pCritSect->s.Core.NativeThreadOwner, pVCpu->hNativeThread);
         STAM_PROFILE_ADV_START(&pCritSect->s.StatLocked, l);
@@ -99 +99 @@
     STAM_REL_COUNTER_INC(&pCritSect->s.StatContentionRZLock);
     return rcBusy;
+#endif /* !IN_RING3 */
+}
+
+
+/**
+ * Try enter a critical section.
+ *
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_SEM_BUSY if the critsect was owned.
+ * @retval  VERR_SEM_NESTED if nested enter on a no nesting section. (Asserted.)
+ * @retval  VERR_SEM_DESTROYED if RTCritSectDelete was called while waiting.
+ *
+ * @param   pCritSect   The critical section.
+ */
+VMMDECL(int) PDMCritSectTryEnter(PPDMCRITSECT pCritSect)
+{
+#ifdef IN_RING3
+    return RTCritSectTryEnter(&pCritSect->s.Core);
+#else   /* !IN_RING3 (same code as PDMCritSectEnter except for the log statement) */
+    AssertMsgReturn(pCritSect->s.Core.u32Magic == RTCRITSECT_MAGIC, ("%RX32\n", pCritSect->s.Core.u32Magic),
+                    VERR_SEM_DESTROYED);
+    PVM pVM = pCritSect->s.CTX_SUFF(pVM);
+    Assert(pVM);
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+    Assert(pVCpu);
+
+    /*
+     * Try to take the lock.
+     */
+    if (ASMAtomicCmpXchgS32(&pCritSect->s.Core.cLockers, 0, -1))
+    {
+        pCritSect->s.Core.cNestings = 1;
+        Assert(pVCpu->hNativeThread != NIL_RTNATIVETHREAD);
+        ASMAtomicXchgSize(&pCritSect->s.Core.NativeThreadOwner, pVCpu->hNativeThread);
+        STAM_PROFILE_ADV_START(&pCritSect->s.StatLocked, l);
+        return VINF_SUCCESS;
+    }
+
+    /*
+     * Nested?
+     */
+    if (pCritSect->s.Core.NativeThreadOwner == pVCpu->hNativeThread)
+    {
+        pCritSect->s.Core.cNestings++;
+        ASMAtomicIncS32(&pCritSect->s.Core.cLockers);
+        return VINF_SUCCESS;
+    }
+
+    /*
+     * Failed.
+     */
+    LogFlow(("PDMCritSectTryEnter: locked\n"));
+    STAM_REL_COUNTER_INC(&pCritSect->s.StatContentionRZLock);
+    return VERR_SEM_BUSY;
 #endif /* !IN_RING3 */
 }