Changeset 6746 in vbox

Timestamp:

Feb 2, 2008 12:55:04 AM (17 years ago)

Author:

vboxsync

Message:

Replaced rtsemMutexValid by assertions like all the recent implementations does. (no performance gain/loss).

File:

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

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

@@ -88 +88 @@
 
 
-/**
- * Validate a Mutex semaphore handle passed to one of the interface.
- *
- * @returns true if valid.
- * @returns false if invalid.
- * @param   pIntMutexSem    Pointer to the mutex semaphore to validate.
- */
-inline bool rtsemMutexValid(struct RTSEMMUTEXINTERNAL *pIntMutexSem)
-{
-    if ((uintptr_t)pIntMutexSem < 0x10000)
-        return false;
-
-    if (pIntMutexSem->iMagic != RTSEMMUTEX_MAGIC)
-        return false;
-
-    if (pIntMutexSem->cNesting == (uint32_t)~0)
-        return false;
-
-    return true;
-}
-
-
 RTDECL(int)  RTSemMutexCreate(PRTSEMMUTEX pMutexSem)
 {
@@ -133 +111 @@
 RTDECL(int)  RTSemMutexDestroy(RTSEMMUTEX MutexSem)
 {
+    /*
+     * Validate input.
+     */
+    if (MutexSem == NIL_RTSEMMUTEX)
+        return VERR_INVALID_HANDLE;
     struct RTSEMMUTEXINTERNAL *pIntMutexSem = MutexSem;
-    /*
-     * Validate input.
-     */
-    if (!rtsemMutexValid(pIntMutexSem))
-    {
-        AssertMsgFailed(("Invalid handle %p!\n", MutexSem));
-        return VERR_INVALID_HANDLE;
-    }
+    AssertPtrReturn(pIntMutexSem, VERR_INVALID_HANDLE);
+    AssertMsgReturn(pIntMutexSem->iMagic == RTSEMMUTEX_MAGIC,
+                    ("MutexSem=%p iMagic=%#x\n", pIntMutexSem, pIntMutexSem->iMagic),
+                    VERR_INVALID_HANDLE);
 
     /*
@@ -153 +132 @@
     }
     pIntMutexSem->Owner    = (pthread_t)~0;
-    pIntMutexSem->cNesting = ~0;
+    pIntMutexSem->cNesting = 0;
 
     /*
@@ -169 +148 @@
      */
     struct RTSEMMUTEXINTERNAL *pIntMutexSem = MutexSem;
-    if (!rtsemMutexValid(pIntMutexSem))
-    {
-        AssertMsgFailed(("Invalid handle %p!\n", MutexSem));
-        return VERR_INVALID_HANDLE;
-    }
+    AssertPtrReturn(pIntMutexSem, VERR_INVALID_HANDLE);
+    AssertMsgReturn(pIntMutexSem->iMagic == RTSEMMUTEX_MAGIC,
+                    ("MutexSem=%p iMagic=%#x\n", pIntMutexSem, pIntMutexSem->iMagic),
+                    VERR_INVALID_HANDLE);
 
     /*
@@ -284 +262 @@
      */
     struct RTSEMMUTEXINTERNAL *pIntMutexSem = MutexSem;
-    if (!rtsemMutexValid(pIntMutexSem))
-    {
-        AssertMsgFailed(("Invalid handle %p!\n", MutexSem));
-        return VERR_INVALID_HANDLE;
-    }
+    AssertPtrReturn(pIntMutexSem, VERR_INVALID_HANDLE);
+    AssertMsgReturn(pIntMutexSem->iMagic == RTSEMMUTEX_MAGIC,
+                    ("MutexSem=%p iMagic=%#x\n", pIntMutexSem, pIntMutexSem->iMagic),
+                    VERR_INVALID_HANDLE);
 
     /*
@@ -294 +271 @@
      */
     pthread_t Self = pthread_self();
-    if (    pIntMutexSem->Owner != Self
-        ||  pIntMutexSem->cNesting == (uint32_t)~0)
+    if (RT_UNLIKELY(    pIntMutexSem->Owner != Self
+                    ||  pIntMutexSem->cNesting == 0))
     {
         AssertMsgFailed(("Not owner of mutex %p!! Self=%08x Owner=%08x cNesting=%d\n",