Changeset 21549 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jul 13, 2009 4:28:52 PM (16 years ago)

Author:

vboxsync

Message:

iprt/log.h: Use the spinning mutexes.

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -198 +198 @@
  * Locks the logger instance.
  *
- * @returns See RTSemFastMutexRequest().
+ * @returns See RTSemSpinMutexRequest().
  * @param   pLogger     The logger instance.
  */
@@ -204 +204 @@
 {
 #ifndef IN_RC
-    if (pLogger->MutexSem != NIL_RTSEMFASTMUTEX)
-    {
-        int rc;
-# if defined(IN_RING0) \
-  && (defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX))
-        if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
-            return VERR_PREEMPT_DISABLED;
-# endif
-        rc = RTSemFastMutexRequest(pLogger->MutexSem);
+    if (pLogger->hSpinMtx != NIL_RTSEMSPINMUTEX)
+    {
+        int rc = RTSemSpinMutexRequest(pLogger->hSpinMtx);
         if (RT_FAILURE(rc))
             return rc;
@@ -228 +222 @@
 {
 #ifndef IN_RC
-    if (pLogger->MutexSem != NIL_RTSEMFASTMUTEX)
-        RTSemFastMutexRelease(pLogger->MutexSem);
+    if (pLogger->hSpinMtx != NIL_RTSEMFASTMUTEX)
+        RTSemSpinMutexRelease(pLogger->hSpinMtx);
 #endif
     return;
@@ -407 +401 @@
             if (RT_SUCCESS(rc))
             {
-                rc = RTSemFastMutexCreate(&pLogger->MutexSem);
+                rc = RTSemSpinMutexCreate(&pLogger->hSpinMtx, RTSEMSPINMUTEX_FLAGS_IRQ_SAFE);
                 if (RT_SUCCESS(rc))
                 {
@@ -415 +409 @@
                     {
                         int32_t c = RTThreadGetWriteLockCount(Thread);
-                        RTSemFastMutexRequest(pLogger->MutexSem);
+                        RTSemSpinMutexRequest(pLogger->hSpinMtx);
                         c = RTThreadGetWriteLockCount(Thread) - c;
-                        RTSemFastMutexRelease(pLogger->MutexSem);
+                        RTSemSpinMutexRelease(pLogger->hSpinMtx);
                         ASMAtomicWriteU32(&g_cLoggerLockCount, c);
                     }
@@ -528 +522 @@
 RTDECL(int) RTLogDestroy(PRTLOGGER pLogger)
 {
-    int            rc;
-    uint32_t       iGroup;
-    RTSEMFASTMUTEX MutexSem;
+    int             rc;
+    uint32_t        iGroup;
+    RTSEMSPINMUTEX  hSpinMtx;
 
     /*
@@ -544 +538 @@
      */
     rc = rtlogLock(pLogger);
-    AssertMsgReturn(RT_SUCCESS(rc) || rc == VERR_PREEMPT_DISABLED, ("%Rrc\n", rc), rc);
+    AssertMsgRCReturn(rc, ("%Rrc\n", rc), rc);
 
     pLogger->fFlags |= RTLOGFLAGS_DISABLED;
@@ -573 +567 @@
      * Free the mutex, the wrapper and the instance memory.
      */
-    MutexSem = pLogger->MutexSem;
-    pLogger->MutexSem = NIL_RTSEMFASTMUTEX;
-    if (MutexSem != NIL_RTSEMFASTMUTEX)
+    hSpinMtx = pLogger->hSpinMtx;
+    pLogger->hSpinMtx = NIL_RTSEMSPINMUTEX;
+    if (hSpinMtx != NIL_RTSEMSPINMUTEX)
     {
         int rc2;
-        RTSemFastMutexRelease(MutexSem);
-        rc2 = RTSemFastMutexDestroy(MutexSem);
+        RTSemSpinMutexRelease(hSpinMtx);
+        rc2 = RTSemSpinMutexDestroy(hSpinMtx);
         AssertRC(rc2);
         if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
@@ -769 +763 @@
     pLogger->pfnLogger    = pfnLogger;
     pLogger->pfnFlush     = pfnFlush;
-    pLogger->MutexSem     = NIL_RTSEMFASTMUTEX; /* Not serialized. */
+    pLogger->hSpinMtx     = NIL_RTSEMSPINMUTEX; /* Not serialized. */
     pLogger->u32Magic     = RTLOGGER_MAGIC;
     pLogger->fFlags       = fFlags;