Changeset 79787 in vbox for trunk/src/VBox

Timestamp:

Jul 15, 2019 11:35:03 AM (5 years ago)

Author:

vboxsync

Message:

IPRT/lockvalidator: Better fix for problem in r132153, as there is no need to sit on the xroad thingy when yielding.

File:

• trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp

@@ -2905 +2905 @@
 {
     RTLOCKVALDDSTACK Stack;
+    rtLockValidatorSerializeDetectionEnter();
     int rc = rtLockValidatorDdDoDetection(&Stack, pRec, pThreadSelf);
+    rtLockValidatorSerializeDetectionLeave();
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;
@@ -2913 +2915 @@
         for (uint32_t iLoop = 0; ; iLoop++)
         {
+            rtLockValidatorSerializeDetectionEnter();
             rc = rtLockValidatorDdDoDetection(&Stack, pRec, pThreadSelf);
+            rtLockValidatorSerializeDetectionLeave();
             if (RT_SUCCESS_NP(rc))
                 return VINF_SUCCESS;
@@ -3373 +3377 @@
                  || pRecU->Excl.hClass->cMsMinDeadlock > RT_INDEFINITE_WAIT))
         rc = VINF_SUCCESS;
-    else
-    {
-        rtLockValidatorSerializeDetectionEnter();
-        if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
-            rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
-        rtLockValidatorSerializeDetectionLeave();
-    }
+    else if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
+        rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
 
     if (RT_SUCCESS(rc))
@@ -3680 +3679 @@
                  || pRec->hClass->cMsMinDeadlock > cMillies))
         rc = VINF_SUCCESS;
-    else
-    {
-        rtLockValidatorSerializeDetectionEnter();
-        if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
-            rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
-        rtLockValidatorSerializeDetectionLeave();
-    }
+    else if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
+        rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
 
     if (RT_SUCCESS(rc))