Changeset 40103 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Feb 13, 2012 5:57:39 PM (13 years ago)

Author:

vboxsync

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

76244

Message:

Runtime/semeventmulti-posix.cpp: Fix bug which causes that a VERR_SEM_DESTROYED error code is not passed to the caller, also use distinct variables for posix status codes and iprt status codes because they are not distinct. Add RT_UNLIKELY for error case

File:

• trunk/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp

@@ -319 +319 @@
      * Validate input.
      */
+    int rc = VINF_SUCCESS;
     struct RTSEMEVENTMULTIINTERNAL *pThis = hEventMultiSem;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
@@ -327 +328 @@
      * Lock the mutex semaphore.
      */
-    int rc = pthread_mutex_lock(&pThis->Mutex);
-    if (rc)
-    {
-        AssertMsgFailed(("Failed to lock event multi sem %p, rc=%d.\n", hEventMultiSem, rc));
-        return RTErrConvertFromErrno(rc);
+    int rcPosix = pthread_mutex_lock(&pThis->Mutex);
+    if (RT_UNLIKELY(rcPosix))
+    {
+        AssertMsgFailed(("Failed to lock event multi sem %p, rc=%d.\n", hEventMultiSem, rcPosix));
+        return RTErrConvertFromErrno(rcPosix);
     }
 
@@ -345 +346 @@
      * Release the mutex and return.
      */
-    rc = pthread_mutex_unlock(&pThis->Mutex);
-    if (rc)
-    {
-        AssertMsgFailed(("Failed to unlock event multi sem %p, rc=%d.\n", hEventMultiSem, rc));
-        return RTErrConvertFromErrno(rc);
-    }
-
-    return VINF_SUCCESS;
-
+    rcPosix = pthread_mutex_unlock(&pThis->Mutex);
+    if (RT_UNLIKELY(rcPosix))
+    {
+        AssertMsgFailed(("Failed to unlock event multi sem %p, rc=%d.\n", hEventMultiSem, rcPosix));
+        return RTErrConvertFromErrno(rcPosix);
+    }
+
+    return rc;
 }