Changeset 59615 in vbox for trunk/src/VBox/Devices/USB/VUSBDevice.cpp

Timestamp:

Feb 9, 2016 1:08:14 PM (9 years ago)

Author:

vboxsync

Message:

USB/VUSBSniffer: Separate API from format to make it possible to introduce other formats to capture the traffic in (will come next)

File:

• trunk/src/VBox/Devices/USB/VUSBDevice.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/USB/VUSBDevice.cpp

@@ -1647 +1647 @@
         Assert(RT_SUCCESS(rc) || rc == VERR_TIMEOUT);
 
-        vusbDevUrbIoThreadWakeup(pDev);
+        /* In case we are called on the I/O thread just process the request. */
+        if (   pDev->hUrbIoThread == RTThreadSelf()
+            && (fFlags & VUSB_DEV_IO_THREAD_EXEC_FLAGS_SYNC))
+        {
+            int rc2 = RTReqQueueProcess(pDev->hReqQueueSync, 0);
+            Assert(RT_SUCCESS(rc2) || rc2 == VERR_TIMEOUT);
+        }
+        else
+            vusbDevUrbIoThreadWakeup(pDev);
+
         if (   rc == VERR_TIMEOUT
             && (fFlags & VUSB_DEV_IO_THREAD_EXEC_FLAGS_SYNC))
@@ -1782 +1791 @@
     if (pszCaptureFilename)
     {
-        rc = VUSBSnifferCreate(&pDev->hSniffer, 0, pszCaptureFilename, NULL);
+        rc = VUSBSnifferCreate(&pDev->hSniffer, 0, pszCaptureFilename, NULL, NULL);
         AssertRCReturn(rc, rc);
     }