Changeset 60626 in vbox

Timestamp:

Apr 21, 2016 1:23:41 PM (8 years ago)

Author:

vboxsync

Message:

dbgf.cpp: turned annoying assertion into non-asserting check.

File:

• trunk/src/VBox/VMM/VMMR3/DBGF.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/DBGF.cpp

@@ -1218 +1218 @@
     VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
     AssertReturn(pVM->dbgf.s.fAttached, VERR_DBGF_NOT_ATTACHED);
-    AssertReturn(RTSemPongIsSpeaker(&pVM->dbgf.s.PingPong), VERR_SEM_OUT_OF_TURN);
+    if (RT_LIKELY(RTSemPongIsSpeaker(&pVM->dbgf.s.PingPong)))
+    { /* likely */ }
+    else
+        return VERR_SEM_OUT_OF_TURN;
 
     /*
@@ -1249 +1252 @@
     PVM pVM = pUVM->pVM;
     VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+    AssertReturn(idCpu < pVM->cCpus, VERR_INVALID_PARAMETER);
     AssertReturn(pVM->dbgf.s.fAttached, VERR_DBGF_NOT_ATTACHED);
-    AssertReturn(RTSemPongIsSpeaker(&pVM->dbgf.s.PingPong), VERR_SEM_OUT_OF_TURN);
-    AssertReturn(idCpu < pVM->cCpus, VERR_INVALID_PARAMETER);
+    if (RT_LIKELY(RTSemPongIsSpeaker(&pVM->dbgf.s.PingPong)))
+    { /* likely */ }
+    else
+        return VERR_SEM_OUT_OF_TURN;
 
     /*