Changeset 22579 in vbox

Timestamp:

Aug 30, 2009 8:36:50 PM (15 years ago)

Author:

vboxsync

Message:

Runtime/semfastmutex-r0drv-freebsd:

Replace mutexes with shared/exclusive locks because it
is not possible to sleep while holding mutexes.
Fixes warnings with WITNESS and IVNARIANTS kernel option.

File:

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

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

@@ -53 +53 @@
     /** Magic value (RTSEMFASTMUTEX_MAGIC). */
     uint32_t            u32Magic;
-    /** The FreeBSD (sleep) mutex. */
-    struct mtx          Mtx;
+    /** The FreeBSD shared/exclusive lock mutex. */
+    struct sx           SxLock;
 } RTSEMFASTMUTEXINTERNAL, *PRTSEMFASTMUTEXINTERNAL;
 
@@ -67 +67 @@
     {
         pFastInt->u32Magic = RTSEMFASTMUTEX_MAGIC;
-        mtx_init(&pFastInt->Mtx, "IPRT Fast Mutex Semaphore", NULL, MTX_DEF | MTX_RECURSE);
+        sx_init(&pFastInt->SxLock, "IPRT Fast Mutex Semaphore");
         *pMutexSem = pFastInt;
         return VINF_SUCCESS;
@@ -86 +86 @@
 
     ASMAtomicXchgU32(&pFastInt->u32Magic, RTSEMFASTMUTEX_MAGIC_DEAD);
-    mtx_destroy(&pFastInt->Mtx);
+    sx_destroy(&pFastInt->SxLock);
     RTMemFree(pFastInt);
 
@@ -101 +101 @@
                     VERR_INVALID_PARAMETER);
 
-    mtx_lock(&pFastInt->Mtx);
+    sx_xlock(&pFastInt->SxLock);
     return VINF_SUCCESS;
 }
@@ -114 +114 @@
                     VERR_INVALID_PARAMETER);
 
-    mtx_unlock(&pFastInt->Mtx);
+    sx_xunlock(&pFastInt->SxLock);
     return VINF_SUCCESS;
 }