Changeset 49817 in vbox for trunk/src

Timestamp:

Dec 6, 2013 9:54:10 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91159

Message:

Fix darwin burn

File:

• trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp

@@ -241 +241 @@
     /** The tail of the landed Darwin URBs. */
     PUSBPROXYURBOSX         pTaxingTail;
+    /** Runloop reference of the thread reaping. */
+    volatile CFRunLoopRef   hRunLoopReaping;
+    /** Flag whether the reaping thread is about the be waked. */
+    volatile bool           fReapingThreadWake;
 } USBPROXYDEVOSX, *PUSBPROXYDEVOSX;
 
@@ -1790 +1794 @@
     PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
 
+    ASMAtomicXchgPtr((void * volatile *)&pDevOsX->hRunLoopReaping, CFRunLoopGetCurrent());
+
+    if (ASMAtomicReadBool(&pDevOsX->fReapingThreadWake))
+    {
+        /* Return immediately. */
+        ASMAtomicXchgPtr((void * volatile *)&pDevOsX->hRunLoopReaping, NULL);
+        return NULL;
+    }
+
     /*
      * If we've got any in-flight URBs, excercise the runloop.
@@ -1800 +1813 @@
         &&  pDevOsX->pInFlightHead)
         CFRunLoopRunInMode(g_pRunLoopMode, cMillies / 1000.0, true);
+
+    ASMAtomicXchgPtr((void * volatile *)&pDevOsX->hRunLoopReaping, NULL);
 
     /*
@@ -1872 +1887 @@
 
 
-static int usbProxyDarwinUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies)
+static int usbProxyDarwinWakeup(PUSBPROXYDEV pProxyDev)
 {
     PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
 
-    CFRunLoopStop(g_pRunLoopMode);
+    ASMAtomicXchgBool(&pDevOsX->fReapingThreadWake, true);
+
+    CFRunLoopRef hRunLoopWake = (CFRunLoopRef)ASMAtomicReadPtr((void * volatile *)&pDevOsX->hRunLoopReaping);
+    if (hRunLoopWake)
+        CFRunLoopStop(hRunLoopWake);
+
+    ASMAtomicXchgBool(&pDevOsX->fReapingThreadWake, false);
+
     return VINF_SUCCESS;
 }