Changeset 57246 in vbox for trunk/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp

Timestamp:

Aug 7, 2015 7:51:45 PM (9 years ago)

Author:

vboxsync

Message:

iprt/darwin/r0drv: More saving of EFLAGS/AC, seems anything that may block is evil (not a surprise).

File:

• trunk/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp (modified) (12 diffs)

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

@@ -101 +101 @@
     AssertPtrReturn(phEventSem, VERR_INVALID_POINTER);
     RT_ASSERT_PREEMPTIBLE();
+    IPRT_DARWIN_SAVE_EFL_AC();
 
     PRTSEMEVENTINTERNAL pThis = (PRTSEMEVENTINTERNAL)RTMemAlloc(sizeof(*pThis));
@@ -115 +116 @@
         {
             *phEventSem = pThis;
+            IPRT_DARWIN_RESTORE_EFL_AC();
             return VINF_SUCCESS;
         }
@@ -121 +123 @@
         RTMemFree(pThis);
     }
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return VERR_NO_MEMORY;
 }
@@ -147 +150 @@
     {
         Assert(pThis->u32Magic != RTSEMEVENT_MAGIC);
+        IPRT_DARWIN_SAVE_EFL_AC();
+
         lck_spin_destroy(pThis->pSpinlock, g_pDarwinLockGroup);
         RTMemFree(pThis);
+
+        IPRT_DARWIN_RESTORE_EFL_AC();
     }
 }
@@ -160 +167 @@
     AssertMsgReturn(pThis->u32Magic == RTSEMEVENT_MAGIC, ("pThis=%p u32Magic=%#x\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);
     RT_ASSERT_INTS_ON();
+    IPRT_DARWIN_SAVE_EFL_AC();
 
     lck_spin_lock(pThis->pSpinlock);
@@ -177 +185 @@
     rtR0SemEventDarwinRelease(pThis);
 
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return VINF_SUCCESS;
 }
@@ -190 +199 @@
     RT_ASSERT_PREEMPT_CPUID_VAR();
     RT_ASSERT_INTS_ON();
+    IPRT_DARWIN_SAVE_EFL_AC();
 
     rtR0SemEventDarwinRetain(pThis);
@@ -218 +228 @@
 
     RT_ASSERT_PREEMPT_CPUID();
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return VINF_SUCCESS;
 }
@@ -240 +251 @@
     AssertMsgReturn(pThis->u32Magic == RTSEMEVENT_MAGIC, ("%p u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_PARAMETER);
     AssertReturn(RTSEMWAIT_FLAGS_ARE_VALID(fFlags), VERR_INVALID_PARAMETER);
+    IPRT_DARWIN_SAVE_EFL_AC();
 
     rtR0SemEventDarwinRetain(pThis);
@@ -308 +320 @@
                  */
                 ASMAtomicWriteBool(&pThis->fHaveBlockedThreads, true);
-                IPRT_DARWIN_SAVE_EFL_AC();
                 wait_interrupt_t fInterruptible = fFlags & RTSEMWAIT_FLAGS_INTERRUPTIBLE ? THREAD_ABORTSAFE : THREAD_UNINT;
                 wait_result_t    rcWait;
@@ -320 +331 @@
                                                      (event_t)&Waiter, fInterruptible, u64AbsTime);
                 }
-                IPRT_DARWIN_RESTORE_EFL_AC();
 
                 /*
@@ -370 +380 @@
     lck_spin_unlock(pThis->pSpinlock);
     rtR0SemEventDarwinRelease(pThis);
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return rc;
 }