Changeset 65883 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Feb 25, 2017 7:32:34 PM (8 years ago)

Author:

vboxsync

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

113666

Message:

Main/USBProxyBackendUsbIp: Follow up fix, only clear the device list if a connection to the server couldn't be established for some time. Increase the timespan between tries from 1 second to 3 seconds to avoid unnecessary network traffic

File:

• trunk/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2015-2016 Oracle Corporation
+ * Copyright (C) 2015-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -39 +39 @@
 #include <iprt/asm.h>
 #include <iprt/cdefs.h>
+#include <iprt/time.h>
 
 /** The USB/IP default port to connect to. */
@@ -244 +245 @@
     /** Current amount of devices in the list. */
     uint32_t                 cDevicesCur;
+    /** Timestamp of the last time we successfully connected. */
+    uint64_t                 tsConnectSuccessLast;
 };
 
@@ -290 +293 @@
 
     m = new Data;
+
+    m->tsConnectSuccessLast = 0;
 
     /* Split address into hostname and port. */
@@ -489 +494 @@
         /* Limit the waiting time to 3sec so we can either reconnect or get a new device list. */
         if (m->hSocket == NIL_RTSOCKET || m->enmRecvState == kUsbIpRecvState_None)
-            msWait = RT_MIN(1000, aMillies);
+            msWait = RT_MIN(3000, aMillies);
 
         rc = RTPoll(m->hPollSet, msWait, &fEventsRecv, &uIdReady);
@@ -563 +568 @@
                              || rc == VERR_NET_CONNECTION_REFUSED)
                     {
-                        /* Make sure the device list is clear. */
-#if 0
-                        RTSemFastMutexRequest(m->hMtxDevices);
-                        if (m->pUsbDevicesCur)
-                        {
-                            freeDeviceList(m->pUsbDevicesCur);
+                        if (hasDevListChanged(m->pHead))
                             fDeviceListChangedOrWokenUp = true;
-                            m->cUsbDevicesCur = 0;
-                            m->pUsbDevicesCur = NULL;
-                        }
-                        RTSemFastMutexRelease(m->hMtxDevices);
-#endif
                         rc = VINF_SUCCESS;
                     }
@@ -739 +734 @@
         }
         else
+        {
             LogFlowFunc(("Connected to host \"%s\"\n", m->pszHost));
+            m->tsConnectSuccessLast = RTTimeMilliTS();
+        }
+    }
+    else if (m->tsConnectSuccessLast + 10 * RT_MS_1SEC < RTTimeMilliTS())
+    {
+        /* Make sure the device list is clear if we failed to reconnect for some time. */
+        RTSemFastMutexRequest(m->hMtxDevices);
+        if (m->pUsbDevicesCur)
+        {
+            freeDeviceList(m->pUsbDevicesCur);
+            m->cUsbDevicesCur = 0;
+            m->pUsbDevicesCur = NULL;
+        }
+        RTSemFastMutexRelease(m->hMtxDevices);
     }