Changeset 25722 in vbox for trunk/src/VBox/Runtime/r0drv/linux

Timestamp:

Jan 11, 2010 2:22:03 PM (15 years ago)

Author:

vboxsync

Message:

iprt/RTSemFastMutex: A little cleanup.

File:

• trunk/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c (modified) (5 diffs)

trunk/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c

@@ -66 +66 @@
 
 
-RTDECL(int)  RTSemFastMutexCreate(PRTSEMFASTMUTEX pMutexSem)
+RTDECL(int)  RTSemFastMutexCreate(PRTSEMFASTMUTEX phFastMtx)
 {
     /*
      * Allocate.
      */
-    PRTSEMFASTMUTEXINTERNAL pFastInt;
-    pFastInt = (PRTSEMFASTMUTEXINTERNAL)RTMemAlloc(sizeof(*pFastInt));
-    if (!pFastInt)
+    PRTSEMFASTMUTEXINTERNAL pThis;
+    pThis = (PRTSEMFASTMUTEXINTERNAL)RTMemAlloc(sizeof(*pThis));
+    if (!pThis)
         return VERR_NO_MEMORY;
 
@@ -79 +79 @@
      * Initialize.
      */
-    pFastInt->u32Magic = RTSEMFASTMUTEX_MAGIC;
-    sema_init(&pFastInt->Semaphore, 1);
+    pThis->u32Magic = RTSEMFASTMUTEX_MAGIC;
+    sema_init(&pThis->Semaphore, 1);
 #ifdef IPRT_DEBUG_SEMS
-    pFastInt->Owner = NIL_RTNATIVETHREAD;
+    pThis->Owner = NIL_RTNATIVETHREAD;
 #endif
-    *pMutexSem = pFastInt;
+
+    *phFastMtx = pThis;
     return VINF_SUCCESS;
 }
@@ -90 +91 @@
 
 
-RTDECL(int)  RTSemFastMutexDestroy(RTSEMFASTMUTEX MutexSem)
+RTDECL(int)  RTSemFastMutexDestroy(RTSEMFASTMUTEX hFastMtx)
 {
     /*
      * Validate.
      */
-    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;
-    }
+    PRTSEMFASTMUTEXINTERNAL pThis = hFastMtx;
+    if (pThis == NIL_RTSEMFASTMUTEX)
+        return VINF_SUCCESS;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("u32Magic=%RX32 pThis=%p\n", pThis->u32Magic, pThis), VERR_INVALID_HANDLE);
 
-    ASMAtomicIncU32(&pFastInt->u32Magic);
-    RTMemFree(pFastInt);
+    ASMAtomicWriteU32(&pThis->u32Magic, RTSEMFASTMUTEX_MAGIC_DEAD);
+    RTMemFree(pThis);
     return VINF_SUCCESS;
 }
@@ -111 +109 @@
 
 
-RTDECL(int)  RTSemFastMutexRequest(RTSEMFASTMUTEX MutexSem)
+RTDECL(int)  RTSemFastMutexRequest(RTSEMFASTMUTEX hFastMtx)
 {
     /*
      * 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;
-    }
+    PRTSEMFASTMUTEXINTERNAL pThis = hFastMtx;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("u32Magic=%RX32 pThis=%p\n", pThis->u32Magic, pThis), VERR_INVALID_HANDLE);
 
 #ifdef IPRT_DEBUG_SEMS
-    snprintf(current->comm, TASK_COMM_LEN, "d%lx", IPRT_DEBUG_SEMS_ADDRESS(pFastInt));
+    snprintf(current->comm, TASK_COMM_LEN, "d%lx", IPRT_DEBUG_SEMS_ADDRESS(pThis));
 #endif
-    down(&pFastInt->Semaphore);
+    down(&pThis->Semaphore);
 #ifdef IPRT_DEBUG_SEMS
-    snprintf(current->comm, TASK_COMM_LEN, "o%lx", IPRT_DEBUG_SEMS_ADDRESS(pFastInt));
-    AssertRelease(pFastInt->Owner == NIL_RTNATIVETHREAD);
-    ASMAtomicUoWriteSize(&pFastInt->Owner, RTThreadNativeSelf());
+    snprintf(current->comm, TASK_COMM_LEN, "o%lx", IPRT_DEBUG_SEMS_ADDRESS(pThis));
+    AssertRelease(pThis->Owner == NIL_RTNATIVETHREAD);
+    ASMAtomicUoWriteSize(&pThis->Owner, RTThreadNativeSelf());
 #endif
     return VINF_SUCCESS;
@@ -138 +132 @@
 
 
-RTDECL(int)  RTSemFastMutexRelease(RTSEMFASTMUTEX MutexSem)
+RTDECL(int)  RTSemFastMutexRelease(RTSEMFASTMUTEX hFastMtx)
 {
     /*
      * 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;
-    }
+    PRTSEMFASTMUTEXINTERNAL pThis = hFastMtx;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("u32Magic=%RX32 pThis=%p\n", pThis->u32Magic, pThis), VERR_INVALID_HANDLE);
 
 #ifdef IPRT_DEBUG_SEMS
-    AssertRelease(pFastInt->Owner == RTThreadNativeSelf());
-    ASMAtomicUoWriteSize(&pFastInt->Owner, NIL_RTNATIVETHREAD);
+    AssertRelease(pThis->Owner == RTThreadNativeSelf());
+    ASMAtomicUoWriteSize(&pThis->Owner, NIL_RTNATIVETHREAD);
 #endif
-    up(&pFastInt->Semaphore);
+    up(&pThis->Semaphore);
 #ifdef IPRT_DEBUG_SEMS
-    snprintf(current->comm, TASK_COMM_LEN, "u%lx", IPRT_DEBUG_SEMS_ADDRESS(pFastInt));
+    snprintf(current->comm, TASK_COMM_LEN, "u%lx", IPRT_DEBUG_SEMS_ADDRESS(pThis));
 #endif
     return VINF_SUCCESS;