Changeset 22074 in vbox

Timestamp:

Aug 7, 2009 3:27:36 PM (15 years ago)

Author:

vboxsync

Message:

semaphore-r0drv-darwin.cpp: cMillies == 0 will not block.

File:

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

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

@@ -217 +217 @@
                     ("pEventInt=%p u32Magic=%#x\n", pEventInt, pEventInt->u32Magic),
                     VERR_INVALID_HANDLE);
-    RT_ASSERT_PREEMPTIBLE();
-        
+    if (cMillies)
+        RT_ASSERT_PREEMPTIBLE();
+
     lck_spin_lock(pEventInt->pSpinlock);
 
@@ -228 +229 @@
         rc = VINF_SUCCESS;
     }
+    else if (!cMillies)
+        rc = VERR_TIMEOUT;
     else
     {
@@ -408 +411 @@
                     ("pEventMultiInt=%p u32Magic=%#x\n", pEventMultiInt, pEventMultiInt->u32Magic),
                     VERR_INVALID_HANDLE);
+    RT_ASSERT_PREEMPT_CPUID_VAR();
+    RT_ASSERT_INTS_ON();
 
     lck_spin_lock(pEventMultiInt->pSpinlock);
     ASMAtomicXchgU8(&pEventMultiInt->fSignaled, false);
     lck_spin_unlock(pEventMultiInt->pSpinlock);
+
+    RT_ASSERT_PREEMPT_CPUID();
     return VINF_SUCCESS;
 }
@@ -423 +430 @@
                     ("pEventMultiInt=%p u32Magic=%#x\n", pEventMultiInt, pEventMultiInt->u32Magic),
                     VERR_INVALID_HANDLE);
-    RT_ASSERT_PREEMPTIBLE();
+    if (cMillies)
+        RT_ASSERT_PREEMPTIBLE();
 
     lck_spin_lock(pEventMultiInt->pSpinlock);
@@ -430 +438 @@
     if (pEventMultiInt->fSignaled)
         rc = VINF_SUCCESS;
+    else if (!cMillies)
+        rc = VERR_TIMEOUT;
     else
     {
@@ -578 +588 @@
               ("pMutexInt->u32Magic=%RX32 pMutexInt=%p\n", pMutexInt->u32Magic, pMutexInt)
               VERR_INVALID_PARAMETER);
-    RT_ASSERT_PREEMPTIBLE();
+    if (cMillies)
+        RT_ASSERT_PREEMPTIBLE();
 
     /*