Changeset 49814 in vbox for trunk/src/VBox/Devices/USB/linux

Timestamp:

Dec 6, 2013 9:38:28 PM (11 years ago)

Author:

vboxsync

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

91156

Message:

Devices/USB: First part of the rework, move most of the work to dedicated threads to improve performance

File:

• trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp (modified) (8 diffs)

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

@@ -33 +33 @@
 #include <iprt/stdint.h>
 #include <iprt/err.h>
+#include <iprt/pipe.h>
 
 #include <sys/types.h>
@@ -153 +154 @@
     /** Are we using sysfs to find the active configuration? */
     bool                fUsingSysfs;
+    /** Pipe handle for waiking up - writing end. */
+    RTPIPE              hPipeWakeupW;
+    /** Pipe handle for waiking up - reading end. */
+    RTPIPE              hPipeWakeupR;
     /** The device node/sysfs path of the device.
      * Used to figure out the configuration after a reset. */
@@ -657 +662 @@
     if (RT_SUCCESS(rc))
     {
-        /*
-         * Allocate and initialize the linux backend data.
-         */
-        PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)RTMemAllocZVar(sizeof(*pDevLnx) + cchPath);
-        if (pDevLnx)
-        {
-            pDevLnx->fUsingSysfs = fUsingSysfs;
-            memcpy(&pDevLnx->szPath[0], pszPath, cchPath);
-            pDevLnx->szPath[cchPath] = '\0';
-            pDevLnx->hFile = hFile;
-            rc = RTCritSectInit(&pDevLnx->CritSect);
-            if (RT_SUCCESS(rc))
+            /*
+             * Allocate and initialize the linux backend data.
+             */
+            PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)RTMemAllocZVar(sizeof(*pDevLnx) + cchPath);
+            if (pDevLnx)
             {
-                pProxyDev->Backend.pv = pDevLnx;
-
-                LogFlow(("usbProxyLinuxOpen(%p, %s): returns successfully File=%RTfile iActiveCfg=%d\n",
-                         pProxyDev, pszAddress, pDevLnx->hFile, pProxyDev->iActiveCfg));
-
-                return VINF_SUCCESS;
+
+                rc = RTPipeCreate(&pDevLnx->hPipeWakeupR, &pDevLnx->hPipeWakeupW, 0);
+                if (RT_SUCCESS(rc))
+                {
+                    pDevLnx->fUsingSysfs = fUsingSysfs;
+                    memcpy(&pDevLnx->szPath[0], pszPath, cchPath);
+                    pDevLnx->szPath[cchPath] = '\0';
+                    pDevLnx->hFile = hFile;
+                    rc = RTCritSectInit(&pDevLnx->CritSect);
+                    if (RT_SUCCESS(rc))
+                    {
+                        pProxyDev->Backend.pv = pDevLnx;
+
+                        LogFlow(("usbProxyLinuxOpen(%p, %s): returns successfully File=%RTfile iActiveCfg=%d\n",
+                                 pProxyDev, pszAddress, pDevLnx->hFile, pProxyDev->iActiveCfg));
+
+                        return VINF_SUCCESS;
+                    }
+                    RTPipeClose(pDevLnx->hPipeWakeupR);
+                    RTPipeClose(pDevLnx->hPipeWakeupW);
+                }
+
+                RTMemFree(pDevLnx);
             }
-
-            RTMemFree(pDevLnx);
-        }
-        else
-            rc = VERR_NO_MEMORY;
+            else
+                rc = VERR_NO_MEMORY;
+
         RTFileClose(hFile);
     }
@@ -814 +827 @@
     RTFileClose(pDevLnx->hFile);
     pDevLnx->hFile = NIL_RTFILE;
+
+    RTPipeClose(pDevLnx->hPipeWakeupR);
+    RTPipeClose(pDevLnx->hPipeWakeupW);
 
     RTMemFree(pDevLnx);
@@ -1745 +1761 @@
          */
         if (!pDevLnx->pInFlightHead)
+        {
+            int cMilliesWait = cMillies == RT_INDEFINITE_WAIT ? -1 : cMillies;
+
+            LogFlow(("Nothing in flight, going to sleep\n"));
+
+            struct pollfd pfd;
+
+            pfd.fd = RTPipeToNative(pDevLnx->hPipeWakeupR);
+            pfd.events = POLLIN | POLLHUP;
+            pfd.revents = 0;
+
+            int rc = poll(&pfd, 1, cMilliesWait);
+            Log(("usbProxyLinuxUrbReap: poll rc = %d\n", rc));
+            if (rc >= 1)
+            {
+                /* Drain pipe. */
+               uint8_t bRead;
+               size_t cbIgnored = 0;
+               RTPipeRead(pDevLnx->hPipeWakeupR, &bRead, 1, &cbIgnored);
+            }
             return NULL;
+        }
 
         /*
@@ -1756 +1793 @@
         if (cMillies)
         {
+            int cMilliesWait = cMillies == RT_INDEFINITE_WAIT ? -1 : cMillies;
 
             for (;;)
             {
-                struct pollfd pfd;
-                pfd.fd = RTFileToNative(pDevLnx->hFile);
-                pfd.events = POLLOUT | POLLWRNORM /* completed async */
-                           | POLLERR | POLLHUP    /* disconnected */;
-                pfd.revents = 0;
-                int rc = poll(&pfd, 1, cMillies);
+                struct pollfd pfd[2];
+                pfd[0].fd = RTFileToNative(pDevLnx->hFile);
+                pfd[0].events = POLLOUT | POLLWRNORM /* completed async */
+                              | POLLERR | POLLHUP    /* disconnected */;
+                pfd[0].revents = 0;
+
+                pfd[1].fd = RTPipeToNative(pDevLnx->hPipeWakeupR);
+                pfd[1].events = POLLIN | POLLHUP;
+                pfd[1].revents = 0;
+
+                int rc = poll(&pfd[0], 2, cMilliesWait);
                 Log(("usbProxyLinuxUrbReap: poll rc = %d\n", rc));
                 if (rc >= 1)
+                {
+                    /* If the pipe caused the return drain it. */
+                    if (pfd[1].revents & POLLIN)
+                    {
+                        uint8_t bRead;
+                        size_t cbIgnored = 0;
+                        RTPipeRead(pDevLnx->hPipeWakeupR, &bRead, 1, &cbIgnored);
+                    }
                     break;
+                }
                 if (rc >= 0 /*|| errno == ETIMEOUT*/)
                 {
@@ -1947 +1999 @@
 
 
+static DECLCALLBACK(int) usbProxyLinuxWakeup(PUSBPROXYDEV pProxyDev)
+{
+    PUSBPROXYDEVLNX pDevLnx = (PUSBPROXYDEVLNX)pProxyDev->Backend.pv;
+    size_t cbIgnored;
+
+    LogFlowFunc(("pProxyDev=%p\n", pProxyDev));
+
+    return RTPipeWrite(pDevLnx->hPipeWakeupW, "", 1, &cbIgnored);
+}
+
 /**
  * The Linux USB Proxy Backend.
@@ -1965 +2027 @@
     usbProxyLinuxUrbCancel,
     usbProxyLinuxUrbReap,
+    usbProxyLinuxWakeup,
     0
 };