vbox的更動 50093 路徑 trunk/src/VBox/Devices/USB/darwin

時間撮記:

2014-1-17 下午01:17:34 (11 年 以前)

作者:

vboxsync

訊息:

USBProxy-darwin: Fix high CPU consumption caused by not sleeping in the reap callback. Fix stalling I/O because CFRunLoopStop doesn't always work if the woken thread sleeps in CFRunLoopInMode with the returnAfterSourceHandled flag set to true

檔案:

• trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp (修改) (10 筆差異)

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

@@ -220 +220 @@
     /** we want to add and remove RunLoopSourceRefs to run loop's of
      * every EMT thread participated in USB processing. */
-    RTLISTANCHOR        HeadOfRunLoopLst;
+    RTLISTANCHOR            HeadOfRunLoopLst;
     /** Pointer to the proxy device instance. */
     PUSBPROXYDEV            pProxyDev;
@@ -241 +241 @@
     /** The tail of the landed Darwin URBs. */
     PUSBPROXYURBOSX         pTaxingTail;
+    /* Runloop source for waking up the reaper thread. */
+    CFRunLoopSourceRef      hRunLoopSrcWakeRef;
+    /** List of threads used for reaping which can be woken up. */
+    RTLISTANCHOR            HeadOfRunLoopWakeLst;
     /** Runloop reference of the thread reaping. */
     volatile CFRunLoopRef   hRunLoopReaping;
@@ -1066 +1070 @@
 
 
+static DECLCALLBACK(void) usbProxyDarwinPerformWakeup(void *pInfo)
+{
+    return;
+}
+
 /* -=-=-=-=-=- The exported methods -=-=-=-=-=- */
 
@@ -1261 +1270 @@
                                 if (irc != kIOReturnNoDevice)
                                 {
-                                    //pProxyDev->iActiveCfg = irc == kIOReturnSuccess ? u8Cfg : -1;
-                                    pProxyDev->iActiveCfg = -1;
-                                    pProxyDev->cIgnoreSetConfigs = 1;
-
-                                    pProxyDev->Backend.pv = pDevOsX;
-                                    usbProxyDarwinAddRunLoopRef(&pDevOsX->HeadOfRunLoopLst, pDevOsX->RunLoopSrcRef);
-                                    return VINF_SUCCESS;        /* return */
+                                    CFRunLoopSourceContext CtxRunLoopSource;
+                                    CtxRunLoopSource.version = 0;
+                                    CtxRunLoopSource.info = NULL;
+                                    CtxRunLoopSource.retain = NULL;
+                                    CtxRunLoopSource.release = NULL;
+                                    CtxRunLoopSource.copyDescription = NULL;
+                                    CtxRunLoopSource.equal = NULL;
+                                    CtxRunLoopSource.hash = NULL;
+                                    CtxRunLoopSource.schedule = NULL;
+                                    CtxRunLoopSource.cancel = NULL;
+                                    CtxRunLoopSource.perform = usbProxyDarwinPerformWakeup;
+                                    pDevOsX->hRunLoopSrcWakeRef = CFRunLoopSourceCreate(NULL, 0, &CtxRunLoopSource);
+                                    if (CFRunLoopSourceIsValid(pDevOsX->hRunLoopSrcWakeRef))
+                                    {
+                                        //pProxyDev->iActiveCfg = irc == kIOReturnSuccess ? u8Cfg : -1;
+                                        RTListInit(&pDevOsX->HeadOfRunLoopWakeLst);
+                                        pProxyDev->iActiveCfg = -1;
+                                        pProxyDev->cIgnoreSetConfigs = 1;
+
+                                        pProxyDev->Backend.pv = pDevOsX;
+                                        usbProxyDarwinAddRunLoopRef(&pDevOsX->HeadOfRunLoopLst, pDevOsX->RunLoopSrcRef);
+                                        return VINF_SUCCESS;        /* return */
+                                    }
+                                    else
+                                    {
+                                        LogRel(("USB: Device '%s' out of memory allocating runloop source\n", pszAddress));
+                                        vrc = VERR_NO_MEMORY;
+                                    }
                                 }
                                 vrc = VERR_VUSB_DEVICE_NOT_ATTACHED;
@@ -1349 +1379 @@
         CFRelease(pDevOsX->RunLoopSrcRef);
         pDevOsX->RunLoopSrcRef = NULL;
+    }
+
+    if (pDevOsX->hRunLoopSrcWakeRef)
+    {
+        int rc = usbProxyDarwinRemoveSourceRefFromAllRunLoops(&pDevOsX->HeadOfRunLoopWakeLst, pDevOsX->hRunLoopSrcWakeRef);
+        AssertRC(rc);
+
+        RTListInit((PRTLISTNODE)&pDevOsX->HeadOfRunLoopWakeLst);
+
+        CFRelease(pDevOsX->hRunLoopSrcWakeRef);
+        pDevOsX->hRunLoopSrcWakeRef = NULL;
     }
 
@@ -1763 +1804 @@
      */
     if (RT_LIKELY(irc == kIOReturnSuccess))
+    {
+        Log(("%s: usbProxyDarwinUrbQueue: success\n", pUrb->pszDesc));
         return true;
+    }
     switch (irc)
     {
@@ -1793 +1837 @@
     PVUSBURB pUrb = NULL;
     PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
-
-    ASMAtomicXchgPtr((void * volatile *)&pDevOsX->hRunLoopReaping, CFRunLoopGetCurrent());
-
-    if (ASMAtomicReadBool(&pDevOsX->fReapingThreadWake))
+    CFRunLoopRef hRunLoopRef = CFRunLoopGetCurrent();
+
+    Assert(!pDevOsX->hRunLoopReaping);
+
+    if (!CFRunLoopContainsSource(hRunLoopRef, pDevOsX->hRunLoopSrcWakeRef, g_pRunLoopMode))
+        usbProxyDarwinAddRunLoopRef(&pDevOsX->HeadOfRunLoopWakeLst, pDevOsX->hRunLoopSrcWakeRef);
+
+    ASMAtomicXchgPtr((void * volatile *)&pDevOsX->hRunLoopReaping, hRunLoopRef);
+
+    if (ASMAtomicXchgBool(&pDevOsX->fReapingThreadWake, false))
     {
         /* Return immediately. */
@@ -1810 +1860 @@
 
     if (    !pDevOsX->pTaxingHead
-        &&  cMillies
-        &&  pDevOsX->pInFlightHead)
+        &&  cMillies)
         CFRunLoopRunInMode(g_pRunLoopMode, cMillies / 1000.0, true);
 
     ASMAtomicXchgPtr((void * volatile *)&pDevOsX->hRunLoopReaping, NULL);
+    ASMAtomicXchgBool(&pDevOsX->fReapingThreadWake, false);
 
     /*
@@ -1840 +1890 @@
         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));
+        LogFlowFunc(("LEAVE: NULL pProxyDev=%s returns NULL\n", pProxyDev->pUsbIns->pszName));
+
     return pUrb;
 }
@@ -1891 +1942 @@
     PUSBPROXYDEVOSX pDevOsX = (PUSBPROXYDEVOSX)pProxyDev->Backend.pv;
 
+    LogFlow(("usbProxyDarwinWakeup: pProxyDev=%p\n", pProxyDev));
+
     ASMAtomicXchgBool(&pDevOsX->fReapingThreadWake, true);
 
     CFRunLoopRef hRunLoopWake = (CFRunLoopRef)ASMAtomicReadPtr((void * volatile *)&pDevOsX->hRunLoopReaping);
     if (hRunLoopWake)
-        CFRunLoopStop(hRunLoopWake);
-
-    ASMAtomicXchgBool(&pDevOsX->fReapingThreadWake, false);
+    {
+        LogFlow(("usbProxyDarwinWakeup: Waking runloop %p\n", hRunLoopWake));
+        CFRunLoopSourceSignal(pDevOsX->hRunLoopSrcWakeRef);
+        CFRunLoopWakeUp(hRunLoopWake);
+    }
 
     return VINF_SUCCESS;