Changeset 6748 in vbox

Timestamp:

Feb 2, 2008 1:10:56 AM (17 years ago)

Author:

vboxsync

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

27830

Message:

Same assertion for request/release as in the event sem code. Document the 1-2ns gain because of predicition.

File:

• trunk/src/VBox/Runtime/r3/linux/semmutex-linux.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r3/linux/semmutex-linux.cpp

@@ -148 +148 @@
      */
     struct RTSEMMUTEXINTERNAL *pThis = MutexSem;
-    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
-    AssertMsgReturn(pThis->iMagic == RTSEMMUTEX_MAGIC,
-                    ("MutexSem=%p iMagic=%#x\n", pThis, pThis->iMagic),
-                    VERR_INVALID_HANDLE);
+    AssertReturn(VALID_PTR(pThis) && pThis->iMagic == RTSEMMUTEX_MAGIC,
+                 VERR_INVALID_HANDLE);
 
     /*
@@ -178 +176 @@
     /*
      * Lock the mutex.
+     * Optimize for the uncontended case (makes 1-2 ns difference).
      */
     if (RT_UNLIKELY(!ASMAtomicCmpXchgS32(&pThis->iState, 1, 0)))
@@ -225 +224 @@
         /*
          * When leaving this loop, iState is set to 2. This means that we gained the
-         * Lock and there are _possibly_ some waiters. We don't know exactly as another
+         * lock and there are _possibly_ some waiters. We don't know exactly as another
          * thread might entered this loop at nearly the same time. Therefore we will
          * call futex_wakeup once too often (if _no_ other thread entered this loop).
@@ -262 +261 @@
      */
     struct RTSEMMUTEXINTERNAL *pThis = MutexSem;
-    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
-    AssertMsgReturn(pThis->iMagic == RTSEMMUTEX_MAGIC,
-                    ("MutexSem=%p iMagic=%#x\n", pThis, pThis->iMagic),
-                    VERR_INVALID_HANDLE);
+    AssertReturn(VALID_PTR(pThis) && pThis->iMagic == RTSEMMUTEX_MAGIC,
+                 VERR_INVALID_HANDLE);
 
     /*
@@ -298 +295 @@
      */
     int32_t iNew = ASMAtomicDecS32(&pThis->iState);
-    if (iNew != 0)
+    if (RT_UNLIKELY(iNew != 0))
     {
         /* somebody is waiting, try wake up one of them. */