Changeset 60742 in vbox for trunk/src/VBox/Main/include

Timestamp:

Apr 28, 2016 1:55:03 PM (9 years ago)

Author:

vboxsync

Message:

Main/USBProxy{Service|Backend}: Rework interaction between thos two to be more sane than it currently is (calling into each other back and forth)

Location:

trunk/src/VBox/Main/include

Files:

• USBProxyBackend.h (modified) (14 diffs)
• USBProxyService.h (modified) (2 diffs)

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

@@ -67 +67 @@
     virtual int captureDevice(HostUSBDevice *aDevice);
     virtual void captureDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess);
-    /** @todo unused */
-    virtual void detachingDevice(HostUSBDevice *aDevice);
     virtual int releaseDevice(HostUSBDevice *aDevice);
     virtual void releaseDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess);
@@ -74 +72 @@
 
     static void freeDevice(PUSBDEVICE pDevice);
-
-    HRESULT runAllFiltersOnDevice(ComObjPtr<HostUSBDevice> &aDevice,
-                                  SessionMachinesList &llOpenedMachines,
-                                  SessionMachine *aIgnoreMachine);
-    bool runMachineFilters(SessionMachine *aMachine, ComObjPtr<HostUSBDevice> &aDevice);
-
-    virtual void deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines, PUSBDEVICE aUSBDevice);
-    virtual void deviceRemoved(ComObjPtr<HostUSBDevice> &aDevice);
-    virtual void deviceChanged(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList *pllOpenedMachines, SessionMachine *aIgnoreMachine);
-    virtual bool updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine);
 
 protected:
@@ -94 +82 @@
     virtual int interruptWait(void);
     virtual PUSBDEVICE getDevices(void);
-    bool updateDeviceStateFake(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine);
     uint32_t incRef();
     uint32_t decRef();
@@ -102 +89 @@
     static void initFilterFromDevice(PUSBFILTER aFilter, HostUSBDevice *aDevice);
     static void freeDeviceMembers(PUSBDEVICE pDevice);
+
+    /**
+     * Backend specific callback when a device was added.
+     * (Currently only Linux uses it to adjust the udev polling).
+     */
+    virtual void deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, PUSBDEVICE pDev);
 
 private:
@@ -110 +103 @@
 
     static DECLCALLBACK(int) serviceThread(RTTHREAD Thread, void *pvUser);
+
+    void updateDeviceList(PUSBDEVICE pDevices);
 
 protected:
@@ -126 +121 @@
     /** Reference counter which prevents the backend instance from being removed. */
     uint32_t           m_cRefs;
+    /** List of smart HostUSBDevice pointers. */
+    typedef std::list<ComObjPtr<HostUSBDevice> > HostUSBDeviceList;
+    /** List of the known USB devices for this backend. */
+    HostUSBDeviceList  m_llDevices;
 };
 
@@ -153 +152 @@
     virtual int captureDevice(HostUSBDevice *aDevice);
     virtual void captureDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess);
-    /** @todo unused */
-    virtual void detachingDevice(HostUSBDevice *aDevice);
     virtual int releaseDevice(HostUSBDevice *aDevice);
     virtual void releaseDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess);
@@ -164 +161 @@
     virtual void serviceThreadInit (void);
     virtual void serviceThreadTerm (void);
-    virtual bool updateDeviceState (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine);
 
 private:
@@ -208 +204 @@
     virtual int interruptWait(void);
     virtual PUSBDEVICE getDevices(void);
-    virtual void deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines, PUSBDEVICE aUSBDevice);
-    virtual bool updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine);
+    virtual void deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, PUSBDEVICE aUSBDevice);
 
 private:
@@ -255 +250 @@
     virtual PUSBDEVICE getDevices(void);
     int addDeviceToChain(PUSBDEVICE pDev, PUSBDEVICE *ppFirst, PUSBDEVICE **pppNext, int rc);
-    virtual bool updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine);
 
 private:
@@ -302 +296 @@
     virtual int interruptWait(void);
     virtual PUSBDEVICE getDevices(void);
-    virtual bool updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine);
 
 private:
@@ -334 +327 @@
     virtual int interruptWait(void);
     virtual PUSBDEVICE getDevices(void);
-    virtual bool updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine);
 
 private:
@@ -365 +357 @@
     int addDeviceToChain(PUSBDEVICE pDev, PUSBDEVICE *ppFirst, PUSBDEVICE **pppNext, int rc);
     virtual void deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines, PUSBDEVICE aUSBDevice);
-    virtual bool updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine);
 
 private:
@@ -413 +404 @@
     virtual int interruptWait(void);
     virtual PUSBDEVICE getDevices(void);
-    virtual bool updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine);
 
 private:

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

@@ -83 +83 @@
     typedef std::list< ComObjPtr<HostUSBDeviceFilter> > USBDeviceFilterList;
 
-    void i_updateDeviceList(USBProxyBackend *pUsbProxyBackend, PUSBDEVICE pDevices);
-    void i_getUSBFilters(USBDeviceFilterList *pGlobalFilters);
-
     HRESULT i_loadSettings(const settings::USBDeviceSourcesList &llUSBDeviceSources);
     HRESULT i_saveSettings(settings::USBDeviceSourcesList &llUSBDeviceSources);
+
+    void i_deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, PUSBDEVICE aUSBDevice);
+    void i_deviceRemoved(ComObjPtr<HostUSBDevice> &aDevice);
+    void i_updateDeviceState(ComObjPtr<HostUSBDevice> &aDevice, PUSBDEVICE aUSBDevice, bool fFakeUpdate);
 
 protected:
@@ -101 +102 @@
 
 private:
+
+    HRESULT runAllFiltersOnDevice(ComObjPtr<HostUSBDevice> &aDevice,
+                                  SessionMachinesList &llOpenedMachines,
+                                  SessionMachine *aIgnoreMachine);
+    bool runMachineFilters(SessionMachine *aMachine, ComObjPtr<HostUSBDevice> &aDevice);
+
+    void deviceChanged(ComObjPtr<HostUSBDevice> &aDevice, bool fRunFilters, SessionMachine *aIgnoreMachine);
 
     /** Pointer to the Host object. */