--- src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC
+++ src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c
@@ -62,6 +62,7 @@ RTDECL(int) RTSemMutexCreate(PRTSEMMUTEX phMutexSem)
{
AssertCompile(sizeof(RTSEMMUTEXINTERNAL) > sizeof(void *));
AssertPtrReturn(phMutexSem, VERR_INVALID_POINTER);
+ IPRT_FREEBSD_SAVE_EFL_AC();
PRTSEMMUTEXINTERNAL pThis = (PRTSEMMUTEXINTERNAL)RTMemAllocZ(sizeof(*pThis));
if (pThis)
@@ -70,8 +71,10 @@ RTDECL(int) RTSemMutexCreate(PRTSEMMUTEX phMutexSem)
sx_init_flags(&pThis->SxLock, "IPRT Mutex Semaphore", SX_RECURSE);
*phMutexSem = pThis;
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;
}
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NO_MEMORY;
}
@@ -83,12 +86,14 @@ RTDECL(int) RTSemMutexDestroy(RTSEMMUTEX hMutexSem)
return VINF_SUCCESS;
AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
AssertMsgReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
+ IPRT_FREEBSD_SAVE_EFL_AC();
AssertReturn(ASMAtomicCmpXchgU32(&pThis->u32Magic, RTSEMMUTEX_MAGIC_DEAD, RTSEMMUTEX_MAGIC), VERR_INVALID_HANDLE);
sx_destroy(&pThis->SxLock);
RTMemFree(pThis);
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;
}
@@ -99,6 +104,7 @@ RTDECL(int) RTSemMutexRequest(RTSEMMUTEX hMutexSem, R
int rc;
AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
AssertMsgReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
+ IPRT_FREEBSD_SAVE_EFL_AC();
if (cMillies == RT_INDEFINITE_WAIT)
{
@@ -133,6 +139,7 @@ RTDECL(int) RTSemMutexRequest(RTSEMMUTEX hMutexSem, R
} while (RTTimeSystemMilliTS() - StartTS < cMillies);
}
+ IPRT_FREEBSD_RESTORE_EFL_ONLY_AC();
return VINF_SUCCESS;
}
@@ -149,6 +156,7 @@ RTDECL(int) RTSemMutexRequestNoResume(RTSEMMUTEX hMut
int rc;
AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
AssertMsgReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
+ IPRT_FREEBSD_SAVE_EFL_AC();
if (cMillies == RT_INDEFINITE_WAIT)
{
@@ -186,6 +194,7 @@ RTDECL(int) RTSemMutexRequestNoResume(RTSEMMUTEX hMut
} while (RTTimeSystemMilliTS() - StartTS < cMillies);
}
+ IPRT_FREEBSD_RESTORE_EFL_ONLY_AC();
return VINF_SUCCESS;
}
@@ -201,8 +210,11 @@ RTDECL(int) RTSemMutexRelease(RTSEMMUTEX hMutexSem)
PRTSEMMUTEXINTERNAL pThis = hMutexSem;
AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
AssertMsgReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
+ IPRT_FREEBSD_SAVE_EFL_AC();
sx_xunlock(&pThis->SxLock);
+
+ IPRT_FREEBSD_RESTORE_EFL_ONLY_AC();
return VINF_SUCCESS;
}