Changeset 199 in vbox

Timestamp:

Jan 20, 2007 2:09:02 AM (18 years ago)

Author:

vboxsync

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

17675

Message:

fast mutex sems.

File:

• trunk/src/VBox/Runtime/r0drv/darwin/semaphore-r0drv-darwin.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/semaphore-r0drv-darwin.cpp

@@ -36 +36 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-#if 0/* GRRR */
 #if 0 /** @todo */
 /**
@@ -53 +52 @@
 #endif
 
-
+#if 0 /** @todo */
 /**
  * Darwin mutex semaphore.
@@ -67 +66 @@
 /** Magic for the Darwin mutex semaphore structure. (Douglas Adams) */
 #define RTSEMMUTEX_MAGIC 0x19520311
+#endif
 
 
@@ -197 +197 @@
 
 
+#if 0 /* need proper timeout lock function! */
 RTDECL(int)  RTSemMutexCreate(PRTSEMMUTEX pMutexSem)
 {
@@ -320 +321 @@
 }
 
+#endif /* later */
+
 
 
@@ -325 +328 @@
 RTDECL(int)  RTSemFastMutexCreate(PRTSEMFASTMUTEX pMutexSem)
 {
-    /*
-     * Allocate.
-     */
-    PRTSEMFASTMUTEXINTERNAL pFastInt;
-    Assert(sizeof(*pFastInt) > sizeof(void *));
-    pFastInt = (PRTSEMFASTMUTEXINTERNAL)RTMemAlloc(sizeof(*pFastInt));
-    if (!pFastInt)
-        return VERR_NO_MEMORY;
-
-    /*
-     * Initialize.
-     */
-    pFastInt->u32Magic = RTSEMFASTMUTEX_MAGIC;
-    ExInitializeFastMutex(&pFastInt->Mutex);
-    *pMutexSem = pFastInt;
-    return VINF_SUCCESS;
+    AssertCompile(sizeof(RTSEMFASTMUTEXINTERNAL) > sizeof(void *));
+    AssertPtrReturn(VALID_PTR(pMutexSem), VERR_INVALID_POINTER);
+
+    PRTSEMFASTMUTEXINTERNAL pFastInt = (PRTSEMFASTMUTEXINTERNAL)RTMemAlloc(sizeof(*pFastInt));
+    if (pFastInt)
+    {
+        pFastInt->u32Magic = RTSEMFASTMUTEX_MAGIC;
+        Assert(g_pDarwinLockGroup);
+        pFastInt->pMtx = lck_mtx_alloc_init(g_pDarwinLockGroup, LCK_ATTR_NULL);
+        if (pFastInt->pMtx)
+        {
+            *pMutexSem = pFastInt;
+            return VINF_SUCCESS;
+        }
+
+        RTMemFree(pFastInt);
+    }
+    return VERR_NO_MEMORY;
 }
 
@@ -346 +351 @@
 RTDECL(int)  RTSemFastMutexDestroy(RTSEMFASTMUTEX MutexSem)
 {
-    /*
-     * Validate.
-     */
+    if (MutexSem == NIL_RTSEMFASTMUTEX) /* don't bitch */
+        return VERR_INVALID_PARAMETER;
     PRTSEMFASTMUTEXINTERNAL pFastInt = (PRTSEMFASTMUTEXINTERNAL)MutexSem;
-    if (!pFastInt)
-        return VERR_INVALID_PARAMETER;
-    if (pFastInt->u32Magic != RTSEMFASTMUTEX_MAGIC)
-    {
-        AssertMsgFailed(("pFastInt->u32Magic=%RX32 pMutexInt=%p\n", pFastInt->u32Magic, pFastInt));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    ASMAtomicIncU32(&pFastInt->u32Magic);
+    AssertPtrReturn(VALID_PTR(pFastInt), VERR_INVALID_POINTER);
+    AssertMsgReturn(pFastInt->u32Magic == RTSEMFASTMUTEX_MAGIC,
+                    ("pFastInt->u32Magic=%RX32 pFastInt=%p\n", pFastInt->u32Magic, pFastInt),
+                    VERR_INVALID_PARAMETER);
+
+    ASMAtomicIncU32(&pFastInt->u32Magic); /* make the handle invalid. */
+    Assert(g_pDarwinLockGroup);
+    lck_mtx_free(pFastInt->pMtx, g_pDarwinLockGroup);
+    pFastInt->pMtx = NULL;
     RTMemFree(pFastInt);
+
     return VINF_SUCCESS;
 }
@@ -366 +371 @@
 RTDECL(int)  RTSemFastMutexRequest(RTSEMFASTMUTEX MutexSem)
 {
-    /*
-     * Validate.
-     */
     PRTSEMFASTMUTEXINTERNAL pFastInt = (PRTSEMFASTMUTEXINTERNAL)MutexSem;
-    if (    !pFastInt
-        ||  pFastInt->u32Magic != RTSEMFASTMUTEX_MAGIC)
-    {
-        AssertMsgFailed(("pFastInt->u32Magic=%RX32 pMutexInt=%p\n", pFastInt ? pFastInt->u32Magic : 0, pFastInt));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    ExAcquireFastMutex(&pFastInt->Mutex);
+    AssertMsgReturn(VALID_PTR(pFastInt) && pFastInt->u32Magic == RTSEMFASTMUTEX_MAGIC,
+                    ("pFastInt->u32Magic=%RX32 pFastInt=%p\n", VALID_PTR(pFastInt) ? pFastInt->u32Magic : 0, pFastInt),
+                    VERR_INVALID_PARAMETER);
+    lck_mtx_lock(pFastInt->pMtx);
     return VINF_SUCCESS;
 }
@@ -384 +382 @@
 RTDECL(int)  RTSemFastMutexRelease(RTSEMFASTMUTEX MutexSem)
 {
-    /*
-     * Validate.
-     */
     PRTSEMFASTMUTEXINTERNAL pFastInt = (PRTSEMFASTMUTEXINTERNAL)MutexSem;
-    if (    !pFastInt
-        ||  pFastInt->u32Magic != RTSEMFASTMUTEX_MAGIC)
-    {
-        AssertMsgFailed(("pFastInt->u32Magic=%RX32 pMutexInt=%p\n", pFastInt ? pFastInt->u32Magic : 0, pFastInt));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    ExReleaseFastMutex(&pFastInt->Mutex);
-    return VINF_SUCCESS;
-}
-
-
-#endif
+    AssertMsgReturn(VALID_PTR(pFastInt) && pFastInt->u32Magic == RTSEMFASTMUTEX_MAGIC,
+                    ("pFastInt->u32Magic=%RX32 pFastInt=%p\n", VALID_PTR(pFastInt) ? pFastInt->u32Magic : 0, pFastInt),
+                    VERR_INVALID_PARAMETER);
+    lck_mtx_unlock(pFastInt->pMtx);
+    return VINF_SUCCESS;
+}
+