Changeset 45756 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 26, 2013 4:09:56 AM (12 years ago)

Author:

vboxsync

Message:

VBox/USB:proxy:darwin: detaching bits for vSMP case.

File:

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

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

@@ -37 +37 @@
 #include <iprt/assert.h>
 #include <iprt/critsect.h>
+#include <iprt/list.h>
 #include <iprt/mem.h>
 #include <iprt/once.h>
@@ -165 +166 @@
     uint64_t                u64NextFrameNo;
 } USBPROXYPIPEOSX, *PUSBPROXYPIPEOSX, **PPUSBPROXYPIPEOSX;
+
+typedef struct RUNLOOPREFLIST
+{
+    RTLISTNODE   List;
+    CFRunLoopRef RunLoopRef;
+} RUNLOOPREFLIST, *PRUNLOOPREFLIST;
+typedef RUNLOOPREFLIST **PPRUNLOOPREFLIST;
 
 /**
@@ -192 +200 @@
     /** List of isochronous buffer collections.
      * These are allocated on demand by the URB queuing routine and then recycled until the interface is destroyed. */
+    RTLISTANCHOR HeadOfRunLoopLst;
     PUSBPROXYISOCBUFCOL     pIsocBufCols;
 } USBPROXYIFOSX, *PUSBPROXYIFOSX, **PPUSBPROXYIFOSX;
@@ -209 +218 @@
      * (i.e. the default control pipe stuff). */
     CFRunLoopSourceRef      RunLoopSrcRef;
-    /** The run loop this device and its interfaces send their events to. */
-    CFRunLoopRef            RunLoopRef;
-
+    /** we want to add and remove RunLoopSourceRefs to run loop's of 
+     * every EMT thread participated in USB processing. */
+    RTLISTANCHOR        HeadOfRunLoopLst;
     /** Pointer to the proxy device instance. */
     PUSBPROXYDEV            pProxyDev;
@@ -270 +279 @@
         rc = RTErrConvertFromDarwin(krc);
     return rc;
+}
+
+/**
+ * Adds Source ref to current run loop and adds it the list of runloops.
+ */
+static int usbProxyDarwinAddRunLoopRef(PRTLISTANCHOR pListHead, 
+                                       CFRunLoopSourceRef SourceRef)
+{
+    AssertPtrReturn(pListHead, VERR_INVALID_PARAMETER);
+    AssertReturn(CFRunLoopSourceIsValid(SourceRef), VERR_INVALID_PARAMETER);
+
+    if (CFRunLoopContainsSource(CFRunLoopGetCurrent(), SourceRef, g_pRunLoopMode))
+        return VINF_SUCCESS;
+
+    /* Add to the list */
+    PRUNLOOPREFLIST pListNode = (PRUNLOOPREFLIST)RTMemAllocZ(sizeof(RUNLOOPREFLIST));
+    if (!pListNode)
+        return VERR_NO_MEMORY;
+
+    pListNode->RunLoopRef = CFRunLoopGetCurrent();
+
+    CFRetain(pListNode->RunLoopRef);
+    CFRetain(SourceRef); /* We want to be aware of releasing */
+
+    CFRunLoopAddSource(pListNode->RunLoopRef, SourceRef, g_pRunLoopMode);
+
+    RTListInit(&pListNode->List);
+
+    RTListAppend((PRTLISTNODE)pListHead, &pListNode->List);
+     
+    return VINF_SUCCESS;
+}
+
+
+/*
+ * Removes all source reference from mode of run loop's we've registered them.
+ * 
+ */
+static int usbProxyDarwinRemoveSourceRefFromAllRunLoops(PRTLISTANCHOR pHead, 
+                                                        CFRunLoopSourceRef SourceRef)
+{
+    AssertPtrReturn(pHead, VERR_INVALID_PARAMETER);
+   
+    while (RTListIsEmpty(pHead)) 
+    {
+        PRUNLOOPREFLIST pNode = RTListGetFirst(pHead, RUNLOOPREFLIST, List);
+        /* XXX: Should Release Reference? */
+        Assert(CFGetRetainCount(pNode->RunLoopRef));
+        
+        CFRunLoopRemoveSource(pNode->RunLoopRef, SourceRef, g_pRunLoopMode);
+        CFRelease(SourceRef);
+        CFRelease(pNode->RunLoopRef);
+
+        RTListNodeRemove(&pNode->List);
+
+        RTMemFree(pNode);
+    } 
+
+    return VINF_SUCCESS;
 }
 
@@ -570 +638 @@
     }
 
-    Assert(pDevOsX->pInFlightHead == pUrbOsX);
     /*
      * Remove from the active list.
@@ -579 +646 @@
         pUrbOsX->pPrev->pNext = pUrbOsX->pNext;
     else
+    {
+        Assert(pDevOsX->pInFlightHead == pUrbOsX);
         pDevOsX->pInFlightHead = pUrbOsX->pNext;
+    }
 
     /*
@@ -615 +685 @@
         if (pIf->RunLoopSrcRef)
         {
-            CFRunLoopRemoveSource(pDevOsX->RunLoopRef, pIf->RunLoopSrcRef, g_pRunLoopMode);
+            int rc = usbProxyDarwinRemoveSourceRefFromAllRunLoops((PRTLISTANCHOR)&pIf->HeadOfRunLoopLst, pIf->RunLoopSrcRef);
+            AssertRC(rc);
+
             CFRelease(pIf->RunLoopSrcRef);
             pIf->RunLoopSrcRef = NULL;
+            RTListInit((PRTLISTNODE)&pIf->HeadOfRunLoopLst);
         }
 
@@ -822 +895 @@
                                     if (irc == kIOReturnSuccess)
                                     {
-                                        CFRunLoopAddSource(pDevOsX->RunLoopRef, pIf->RunLoopSrcRef, g_pRunLoopMode);
+                                        RTListInit((PRTLISTNODE)&pIf->HeadOfRunLoopLst);
+                                        usbProxyDarwinAddRunLoopRef(&pIf->HeadOfRunLoopLst, 
+                                                                    pIf->RunLoopSrcRef);
 
                                         /*
@@ -1150 +1225 @@
                 if (pDevOsX)
                 {
+                    RTListInit((PRTLISTNODE)&pDevOsX->HeadOfRunLoopLst);
                     vrc = RTCritSectInit(&pDevOsX->CritSect);
                     if (RT_SUCCESS(vrc))
@@ -1156 +1232 @@
                         pDevOsX->ppDevI = ppDevI;
                         pDevOsX->pProxyDev = pProxyDev;
-                        pDevOsX->RunLoopRef = CFRunLoopGetCurrent();
-                        CFRetain(pDevOsX->RunLoopRef); /* paranoia */
 
                         /*
@@ -1174 +1248 @@
                             if (irc == kIOReturnSuccess)
                             {
-                                CFRunLoopAddSource(pDevOsX->RunLoopRef, pDevOsX->RunLoopSrcRef, g_pRunLoopMode);
-
                                 /*
                                  * Determine the active configuration.
@@ -1190 +1262 @@
 
                                     pProxyDev->Backend.pv = pDevOsX;
+                                    usbProxyDarwinAddRunLoopRef(&pDevOsX->HeadOfRunLoopLst, pDevOsX->RunLoopSrcRef);
                                     return VINF_SUCCESS;        /* return */
                                 }
                                 vrc = VERR_VUSB_DEVICE_NOT_ATTACHED;
-
-                                CFRunLoopRemoveSource(pDevOsX->RunLoopRef, pDevOsX->RunLoopSrcRef, g_pRunLoopMode);
                             }
                             else
@@ -1267 +1338 @@
     if (pDevOsX->RunLoopSrcRef)
     {
-        CFRunLoopRemoveSource(pDevOsX->RunLoopRef, pDevOsX->RunLoopSrcRef, g_pRunLoopMode);
+        int rc = usbProxyDarwinRemoveSourceRefFromAllRunLoops(&pDevOsX->HeadOfRunLoopLst, pDevOsX->RunLoopSrcRef);
+        AssertRC(rc);
+
+        RTListInit((PRTLISTNODE)&pDevOsX->HeadOfRunLoopLst);
+
         CFRelease(pDevOsX->RunLoopSrcRef);
         pDevOsX->RunLoopSrcRef = NULL;
@@ -1295 +1370 @@
      */
     RTCritSectDelete(&pDevOsX->CritSect);
-
-    if (pDevOsX->RunLoopRef)
-    {
-        CFRelease(pDevOsX->RunLoopRef);
-        pDevOsX->RunLoopRef = NULL;
-    }
 
     PUSBPROXYURBOSX pUrbOsX;
@@ -1530 +1599 @@
 
         if (!CFRunLoopContainsSource(CFRunLoopGetCurrent(), pIf->RunLoopSrcRef, g_pRunLoopMode))
-            CFRunLoopAddSource(CFRunLoopGetCurrent(), pIf->RunLoopSrcRef, g_pRunLoopMode);
+            usbProxyDarwinAddRunLoopRef(&pIf->HeadOfRunLoopLst, pIf->RunLoopSrcRef);
 
     }
@@ -1536 +1605 @@
 
     if (!CFRunLoopContainsSource(CFRunLoopGetCurrent(), pDevOsX->RunLoopSrcRef, g_pRunLoopMode))
-        CFRunLoopAddSource(CFRunLoopGetCurrent(), pDevOsX->RunLoopSrcRef, g_pRunLoopMode);
+        usbProxyDarwinAddRunLoopRef(&pDevOsX->HeadOfRunLoopLst, pDevOsX->RunLoopSrcRef);
 
     /*