vbox的更動 50453 路徑 trunk/src/VBox/Devices/USB/VUSBReadAhead.cpp

時間撮記:

2014-2-13 下午06:01:35 (11 年 以前)

作者:

vboxsync

訊息:

USB/ReadAhead: Don't keep the buffered URBs around when the buffer thread is terminated, later buffering might have a different packet size

檔案:

• trunk/src/VBox/Devices/USB/VUSBReadAhead.cpp (修改) (2 筆差異)

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

@@ -174 +174 @@
      * fTerminate to true and returns immediately). Therefore we have to wait until the
      * previous thread is done and all submitted URBs are completed. */
-    while (pPipe->cSubmitted > 0)
+    while (   pPipe->cSubmitted > 0
+           && pPipe->cBuffered > 0)
     {
         Log2(("vusbDevReadAheadThread: still %u packets submitted, waiting before starting...\n", pPipe->cSubmitted));
@@ -246 +247 @@
     }
 
+    /*
+     * Free all still buffered URBs because another endpoint with a different packet size
+     * and complete different data formats might be served later.
+     */
+    while (pPipe->pBuffUrbHead)
+    {
+        PVUSBURB pBufferedUrb = pPipe->pBuffUrbHead;
+
+        pPipe->pBuffUrbHead = pBufferedUrb->Hci.pNext;
+        pBufferedUrb->VUsb.pfnFree(pBufferedUrb);
+    }
+
+    pPipe->pBuffUrbTail = NULL;
+    pPipe->cBuffered = 0;
     RTMemTmpFree(pArgs);