Changeset 45626 in vbox for trunk/src

Timestamp:

Apr 19, 2013 2:44:19 AM (12 years ago)

Author:

vboxsync

Message:

USB/Darwin: checks whether event's sources presents in the run loop of the current thread and adds them if they missed.

File:

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

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

@@ -570 +570 @@
     }
 
+    Assert(pDevOsX->pInFlightHead == pUrbOsX);
     /*
      * Remove from the active list.
@@ -578 +579 @@
         pUrbOsX->pPrev->pNext = pUrbOsX->pNext;
     else
-    {
-        Assert(pDevOsX->pInFlightHead == pUrbOsX);
         pDevOsX->pInFlightHead = pUrbOsX->pNext;
-    }
 
     /*
@@ -1530 +1528 @@
             return false;
         }
+
+        if (!CFRunLoopContainsSource(CFRunLoopGetCurrent(), pIf->RunLoopSrcRef, g_pRunLoopMode))
+            CFRunLoopAddSource(CFRunLoopGetCurrent(), pIf->RunLoopSrcRef, g_pRunLoopMode);
+
     }
     /* else: pIf == NULL -> default control pipe.*/
+
+    if (!CFRunLoopContainsSource(CFRunLoopGetCurrent(), pDevOsX->RunLoopSrcRef, g_pRunLoopMode))
+        CFRunLoopAddSource(CFRunLoopGetCurrent(), pDevOsX->RunLoopSrcRef, g_pRunLoopMode);
 
     /*
@@ -1749 +1754 @@
 
     if (pUrb)
-        LogFlow(("%s: usbProxyDarwinUrbReap: pProxyDev=%s returns %p\n", pUrb->pszDesc, pProxyDev->pUsbIns->pszName, pUrb));
+        LogFlowFunc(("LEAVE: %s: pProxyDev=%s returns %p\n", pUrb->pszDesc, pProxyDev->pUsbIns->pszName, pUrb));
+    else
+        LogFlowFunc(("LEAVE: NULL pProxyDev=%s returns NULL", pProxyDev->pUsbIns->pszName));
     return pUrb;
 }