Changeset 38042 in vbox

Timestamp:

Jul 18, 2011 10:40:50 PM (13 years ago)

Author:

vboxsync

Message:

PDMCritSectEnter: Fixed rcBusy=VINF_SUCCESS case. Only affected non-strict builds, so it was kinda hard to notice, though there should've been occational VERR_SEM_BUSY gurus. Weird.

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp (modified) (1 diff)

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

@@ -320 +320 @@
 VMMDECL(int) PDMCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy)
 {
-    int rc;
-#ifndef IN_RING3
-    if (rcBusy == VINF_SUCCESS)
-    {
-# ifndef PDMCRITSECT_STRICT
-        rc = pdmCritSectEnter(pCritSect, VERR_SEM_BUSY, NULL);
-# else
-        RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
-        rc = pdmCritSectEnter(pCritSect, VERR_SEM_BUSY, &SrcPos);
-# endif
-    }
-    else
-#endif /* !IN_RING3 */
-    {
 #ifndef PDMCRITSECT_STRICT
-        rc = pdmCritSectEnter(pCritSect, rcBusy, NULL);
-#else
-        RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
-        rc = pdmCritSectEnter(pCritSect, rcBusy, &SrcPos);
-#endif
-    }
-    return rc;
+    return pdmCritSectEnter(pCritSect, rcBusy, NULL);
+#else
+    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
+    return pdmCritSectEnter(pCritSect, rcBusy, &SrcPos);
+#endif
 }