Changeset 90612 in vbox

Timestamp:

Aug 10, 2021 10:21:16 PM (4 years ago)

Author:

vboxsync

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

146223

Message:

VMM/PDMCritSecRw: More code refactoring. bugref:6695

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllCritSectRw.cpp (modified) (2 diffs)

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

@@ -1007 +1007 @@
      * Okay, we have contention and will have to wait unless we're just trying.
      */
+    if (fTryOnly)
+    {
+        STAM_REL_COUNTER_INC(&pThis->s.CTX_MID_Z(StatContention,EnterExcl)); /** @todo different statistics for this */
+        return pdmCritSectRwEnterExclBailOut(pThis, VERR_SEM_BUSY);
+    }
+
     STAM_REL_COUNTER_INC(&pThis->s.CTX_MID_Z(StatContention,EnterExcl));
-
 #if defined(IN_RING3) || defined(IN_RING0)
-    if (   !fTryOnly
 # ifdef IN_RING0
-        && RTThreadPreemptIsEnabled(NIL_RTTHREAD)
-        && ASMIntAreEnabled()
+    if (   RTThreadPreemptIsEnabled(NIL_RTTHREAD)
+        && ASMIntAreEnabled())
 # endif
-       )
     {
 # if defined(IN_RING3) && defined(PDMCRITSECTRW_STRICT)
@@ -1029 +1032 @@
 #endif /* IN_RING3 || IN_RING0 */
 
-#ifdef IN_RING3
-    /* TryEnter call - decrement the number of (waiting) writers.  */
-    return pdmCritSectRwEnterExclBailOut(pThis, VERR_SEM_BUSY);
-
-#else
-
+#ifndef IN_RING3
     /* We cannot call SUPSemEventWaitNoResume in this context. Go back to
        ring-3 and do it there or return rcBusy. */