Changeset 32142 in vbox

Timestamp:

Aug 31, 2010 1:00:46 PM (14 years ago)

Author:

vboxsync

Message:

Main/linux/USB: moved a vector container-based implementation detail out of the interface

Location:

trunk/src/VBox/Main

Files:

• include/HostHardwareLinux.h (modified) (3 diffs)
• linux/HostHardwareLinux.cpp (modified) (3 diffs)
• linux/USBProxyServiceLinux.cpp (modified) (3 diffs)
• testcase/tstHostHardwareLinux.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/HostHardwareLinux.h

@@ -110 +110 @@
 
 
-/** Vector type for the list of interfaces. */
-#define VECTOR_TYPE       char *
-#define VECTOR_TYPENAME   USBInterfaceList
-static inline void USBInterfaceListCleanup(char **ppsz)
-{
-    RTStrFree(*ppsz);
-}
-#define VECTOR_DESTRUCTOR USBInterfaceListCleanup
-#include "vector.h"
-
 /** Structure describing a host USB device */
 typedef struct USBDeviceInfo
@@ -128 +118 @@
      * method. */
     char *mSysfsPath;
-    /** Type for the list of interfaces. */
-    USBInterfaceList mInterfaces;
+    /** List of interfaces.  Only one simulaneous traversal is possible. */
+    struct USBInterfaceList *mInterfaces;
 } USBDeviceInfo;
 
-
 /** Destructor. */
-static inline void USBDevInfoCleanup(USBDeviceInfo *pSelf)
-{
-    RTStrFree(pSelf->mDevice);
-    RTStrFree(pSelf->mSysfsPath);
-    pSelf->mDevice = pSelf->mSysfsPath = NULL;
-    USBInterfaceList_cleanup(&pSelf->mInterfaces);
-}
-
+void USBDevInfoCleanup(USBDeviceInfo *pSelf);
 
 /** Constructor - the strings will be duplicated. */
-static inline int USBDevInfoInit(USBDeviceInfo *pSelf, const char *aDevice,
-                                 const char *aSystemID)
-{
-    pSelf->mDevice = aDevice ? RTStrDup(aDevice) : NULL;
-    pSelf->mSysfsPath = aSystemID ? RTStrDup(aSystemID) : NULL;
-    if (   !USBInterfaceList_init(&pSelf->mInterfaces)
-        || (aDevice && !pSelf->mDevice) || (aSystemID && ! pSelf->mSysfsPath))
-    {
-        USBDevInfoCleanup(pSelf);
-        return 0;
-    }
-    return 1;
-}
+int USBDevInfoInit(USBDeviceInfo *pSelf, const char *aDevice,
+                   const char *aSystemID);
+
+/**
+ * Return the first in a list of USB device interfaces (that is, its sysfs
+ * path), or NULL if there are none.
+ */
+char *USBDevInfoFirstInterface(struct USBInterfaceList *pInterfaces);
+
+/**
+ * Return the next in a list of USB device interfaces (that is, its sysfs
+ * path), or NULL if there are none.
+ */
+char *USBDevInfoNextInterface(struct USBInterfaceList *pInterfaces);
 
 
@@ -195 +178 @@
  */
 int USBDevInfoUpdateDevices(VBoxMainUSBDeviceInfo *pSelf);
-
 
 /** Get the first element in the list of USB devices. */

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -1008 +1008 @@
 }
 
+/** Vector type for the list of interfaces. */
+#define VECTOR_TYPE       char *
+#define VECTOR_TYPENAME   usbInterfaceList
+static void usbInterfaceListCleanup(char **ppsz)
+{
+    RTStrFree(*ppsz);
+}
+#define VECTOR_DESTRUCTOR usbInterfaceListCleanup
+#include "vector.h"
+
+struct USBInterfaceList
+{
+    /** The vector of devices */
+    usbInterfaceList mList;
+    /** The single traversal iterator */
+    usbInterfaceList_iterator mIt;
+};
+
+void USBDevInfoCleanup(USBDeviceInfo *pSelf)
+{
+    RTStrFree(pSelf->mDevice);
+    RTStrFree(pSelf->mSysfsPath);
+    pSelf->mDevice = pSelf->mSysfsPath = NULL;
+    if (pSelf->mInterfaces)
+    {
+        usbInterfaceList_cleanup(&pSelf->mInterfaces->mList);
+        RTMemFree(pSelf->mInterfaces);
+    }
+}
+
+int USBDevInfoInit(USBDeviceInfo *pSelf, const char *aDevice,
+                   const char *aSystemID)
+{
+    const usbInterfaceList_iterator *pItBegin;
+
+    pSelf->mDevice = aDevice ? RTStrDup(aDevice) : NULL;
+    pSelf->mSysfsPath = aSystemID ? RTStrDup(aSystemID) : NULL;
+    pSelf->mInterfaces = (struct USBInterfaceList *) RTMemAllocZ(sizeof(struct USBInterfaceList));
+    if (   !pSelf->mInterfaces
+        || !usbInterfaceList_init(&pSelf->mInterfaces->mList)
+        || (aDevice && !pSelf->mDevice) || (aSystemID && ! pSelf->mSysfsPath))
+    {
+        USBDevInfoCleanup(pSelf);
+        return 0;
+    }
+    pItBegin = usbInterfaceList_begin(&pSelf->mInterfaces->mList);
+    usbInterfaceList_iter_init(&pSelf->mInterfaces->mIt, pItBegin);
+    return 1;
+}
 
 int USBDevInfoUpdateDevices (VBoxMainUSBDeviceInfo *pSelf)
@@ -1027 +1076 @@
     return rc;
 }
+
+char *USBDevInfoFirstInterface(struct USBInterfaceList *pInterfaces)
+{
+    const usbInterfaceList_iterator *pItBegin, *pItEnd;
+    pItBegin = usbInterfaceList_begin(&pInterfaces->mList);
+    pItEnd = usbInterfaceList_end(&pInterfaces->mList);
+    usbInterfaceList_iter_init(&pInterfaces->mIt, pItBegin);
+    if (usbInterfaceList_iter_eq(pItBegin, pItEnd))
+        return NULL;
+    return *usbInterfaceList_iter_target(&pInterfaces->mIt);
+}
+
+char *USBDevInfoNextInterface(struct USBInterfaceList *pInterfaces)
+{
+    const usbInterfaceList_iterator *pItEnd;
+    pItEnd = usbInterfaceList_end(&pInterfaces->mList);
+    if (usbInterfaceList_iter_eq(&pInterfaces->mIt, pItEnd))
+        return NULL;
+    usbInterfaceList_iter_incr(&pInterfaces->mIt);
+    if (usbInterfaceList_iter_eq(&pInterfaces->mIt, pItEnd))
+        return NULL;
+    return *usbInterfaceList_iter_target(&pInterfaces->mIt);
+}
+
 
 class hotplugNullImpl : public VBoxMainHotplugWaiterImpl
@@ -1644 +1717 @@
     char *pcszDup = RTStrDup(pcszNode);
     if (pcszDup)
-        if (USBInterfaceList_push_back(&pSelf->mInfo->mInterfaces, &pcszDup))
+        if (usbInterfaceList_push_back(&pSelf->mInfo->mInterfaces->mList,
+                                       &pcszDup))
             return true;
     RTStrFree(pcszDup);

trunk/src/VBox/Main/linux/USBProxyServiceLinux.cpp

@@ -1340 +1340 @@
 {
 #ifdef VBOX_USB_WITH_SYSFS
-    USBDevInfoUpdateDevices(&mDeviceList);
     /* Add each of the devices found to the chain. */
     PUSBDEVICE pFirst = NULL;
     PUSBDEVICE pLast  = NULL;
-    int        rc     = VINF_SUCCESS;
+    int        rc     = USBDevInfoUpdateDevices(&mDeviceList);
     USBDeviceInfoList_iterator it;
     USBDeviceInfoList_iter_init(&it, USBDevInfoBegin(&mDeviceList));
@@ -1442 +1441 @@
 
             /* Check the interfaces to see if we can support the device. */
-            USBInterfaceList_iterator it2;
+            char *pszIf;
             USBDeviceInfo *udi = USBDeviceInfoList_iter_target(&it);
-            USBInterfaceList_iter_init(&it2, USBInterfaceList_begin(&udi->mInterfaces));
-            for (; !USBInterfaceList_iter_eq(&it2, USBInterfaceList_end(&udi->mInterfaces));
-                   USBInterfaceList_iter_incr(&it2))
+            for (pszIf = USBDevInfoFirstInterface(udi->mInterfaces); pszIf;
+                 pszIf = USBDevInfoNextInterface(udi->mInterfaces))
             {
                 ssize_t cb = RTLinuxSysFsGetLinkDest(szBuf, sizeof(szBuf), "%s/driver",
-                                                     *USBInterfaceList_iter_target(&it2));
+                                                     pszIf);
                 if (cb > 0 && Dev->enmState != USBDEVICESTATE_UNSUPPORTED)
                     Dev->enmState = (strcmp(szBuf, "hub") == 0)
@@ -1455 +1453 @@
                                   : USBDEVICESTATE_USED_BY_HOST_CAPTURABLE;
                 if (RTLinuxSysFsReadIntFile(16, "%s/bInterfaceClass",
-                                            *USBInterfaceList_iter_target(&it2)) == 9 /* hub */)
+                                            pszIf) == 9 /* hub */)
                     Dev->enmState = USBDEVICESTATE_UNSUPPORTED;
             }

trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp

@@ -123 +123 @@
                   pInfo->mSysfsPath);
         RTPrintf ("    interfaces:\n");
-        USBInterfaceList_iterator it2;
-        USBInterfaceList_iter_init(&it2, USBInterfaceList_begin(&pInfo->mInterfaces));
-        for (; !USBInterfaceList_iter_eq(&it2, USBInterfaceList_end(&pInfo->mInterfaces));
-               USBInterfaceList_iter_incr(&it2))
+        char *pszIf;
+        for (pszIf = USBDevInfoFirstInterface(pInfo->mInterfaces); pszIf;
+             pszIf = USBDevInfoNextInterface(pInfo->mInterfaces))
         {
             char szDriver[RTPATH_MAX];
-            char *pszIf = *USBInterfaceList_iter_target(&it2);
             strcpy(szDriver, "none");
             ssize_t size = RTLinuxSysFsGetLinkDest(szDriver, sizeof(szDriver),