Changeset 50688 in vbox

Timestamp:

Mar 4, 2014 11:11:39 PM (11 years ago)

Author:

vboxsync

Message:

VBoxGuest/darwin: Delay waking up threads still we're out of interrupt handler context, or we'll trip up in the even semaphore wake up code.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-darwin.cpp (modified) (4 diffs)
• VBoxGuest.cpp (modified) (1 diff)
• VBoxGuestInternal.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-darwin.cpp

@@ -650 +650 @@
 
 /**
- * Just a plug
+ * Perform pending wake ups in work loop context.
  */
 static void
-interruptHandler(OSObject *pOwner, IOInterruptEventSource *pSrc, int cInts)
-{
-    NOREF(pOwner);
-    NOREF(pSrc);
-    NOREF(cInts);
+deferredInterruptHandler(OSObject *pOwner, IOInterruptEventSource *pSrc, int cInts)
+{
+    NOREF(pOwner); NOREF(pSrc); NOREF(cInts);
+
+    VBoxGuestWaitDoWakeUps(&g_DevExt);
 }
 
@@ -664 +664 @@
  */
 static bool
-checkForInterrupt(OSObject *pOwner, IOFilterInterruptEventSource *pSrc)
+directInterruptHandler(OSObject *pOwner, IOFilterInterruptEventSource *pSrc)
 {
     if (!pSrc)
@@ -670 +670 @@
 
     bool fTaken = VBoxGuestCommonISR(&g_DevExt);
-    if (!fTaken)
+    if (!fTaken) /** @todo r=bird: This looks bogus as we might actually be sharing interrupts with someone. */
         printf("VBoxGuestCommonISR error\n");
 
@@ -685 +685 @@
 
     m_pInterruptSrc = IOFilterInterruptEventSource::filterInterruptEventSource(this,
-                                                                               &interruptHandler,
-                                                                               &checkForInterrupt,
+                                                                               &deferredInterruptHandler,
+                                                                               &directInterruptHandler,
                                                                                pProvider);
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -3089 +3089 @@
     RTSpinlockReleaseNoInts(pDevExt->EventSpinlock);
 
-#if defined(VBOXGUEST_USE_DEFERRED_WAKE_UP) && !defined(RT_OS_WINDOWS)
+#if defined(VBOXGUEST_USE_DEFERRED_WAKE_UP) && !defined(RT_OS_DARWIN) && !defined(RT_OS_WINDOWS)
     /*
      * Do wake-ups.
      * Note. On Windows this isn't possible at this IRQL, so a DPC will take
-     *       care of it.
+     *       care of it.  Same on darwin, doing it in the work loop callback.
      */
     VBoxGuestWaitDoWakeUps(pDevExt);

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -38 +38 @@
 /** @def VBOXGUEST_USE_WAKE_UP_LIST
  * Defer wake-up of waiting thread when defined. */
-#if defined(RT_OS_SOLARIS) || defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING)
+#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING)
 # define VBOXGUEST_USE_DEFERRED_WAKE_UP
 #endif