Changeset 8666 in vbox for trunk

Timestamp:

May 7, 2008 3:24:57 PM (17 years ago)

Author:

vboxsync

Message:

Removed the duplicate USB device list in Host and moved 4 methods over to USBProxyService.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (6 diffs)
• MachineImpl.cpp (modified) (5 diffs)
• include/HostImpl.h (modified) (4 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -187 +187 @@
 #ifdef VBOX_WITH_USB
     mUSBDeviceFilters.clear();
-    mUSBDevices.clear();
 #endif
 
@@ -589 +588 @@
     CheckComRCReturnRC (rc);
 
-    ComObjPtr <HostUSBDeviceCollection> collection;
-    collection.createObject();
-    collection->init (mUSBDevices);
-    collection.queryInterfaceTo (aUSBDevices);
-
-    return rc;
+    return mUSBProxyService->getDeviceCollection (aUSBDevices);
+
 #else
     /* Note: The GUI depends on this method returning E_NOTIMPL with no
@@ -1220 +1215 @@
 
 #ifdef VBOX_WITH_USB
-
 /**
  *  Called by setter methods of all USB device filters.
@@ -1265 +1259 @@
     return S_OK;
 }
-
-
-/**
- *  Requests the USB proxy service to capture the given host USB device.
- *
- *  When the request is completed,
- *  IInternalSessionControl::onUSBDeviceAttach() will be called on the given
- *  machine object.
- *
- *  Called by Console from the VM process (throug IInternalMachineControl).
- *  Must return extended error info in case of errors.
- */
-HRESULT Host::captureUSBDevice (SessionMachine *aMachine, INPTR GUIDPARAM aId)
-{
-    ComAssertRet (aMachine, E_INVALIDARG);
-
-    AutoWriteLock alock (this);
-    CHECK_READY();
-
-    /*
-     * Translate the device id into a device object.
-     */
-    Guid id (aId);
-    ComObjPtr <HostUSBDevice> device;
-    USBDeviceList::iterator it = mUSBDevices.begin();
-    while (!device && it != mUSBDevices.end())
-    {
-        if ((*it)->id() == id)
-            device = (*it);
-        ++ it;
-    }
-    if (!device)
-        return setError (E_INVALIDARG,
-            tr ("USB device with UUID {%Vuuid} is not currently attached to the host"),
-            id.raw());
-
-    /*
-     * Try to capture the device
-     */
-    AutoWriteLock devLock (device);
-    device->requestCaptureForVM (aMachine, true /* aSetError */);
-
-    return S_OK;
-}
-
-/**
- *  Notification from the VM process that it is going to detach (\a aDone = false)
- *  or that is has just detach (\a aDone = true) the given USB device.
- *
- *  When \a aDone = false we only inform the USB Proxy about what the vm is
- *  up to so it doesn't get confused and create a new USB host device object
- *  (a Darwin issue).
- *
- *  When \a aDone = true we replay all filters against the given USB device
- *  excluding filters of the machine the device is currently marked as
- *  captured by.
- *
- *  When the \a aDone = true request is completed,
- *  IInternalSessionControl::onUSBDeviceDetach() will be called on the given
- *  machine object.
- *
- *  Called by Console from the VM process (throug IInternalMachineControl).
- *
- */
-HRESULT Host::detachUSBDevice (SessionMachine *aMachine, INPTR GUIDPARAM aId, BOOL aDone)
-{
-    LogFlowThisFunc (("aMachine=%p, aId={%Vuuid}\n", aMachine, Guid (aId).raw()));
-
-    AutoWriteLock alock (this);
-    CHECK_READY();
-
-    ComObjPtr <HostUSBDevice> device;
-    USBDeviceList::iterator it = mUSBDevices.begin();
-    while (!device && it != mUSBDevices.end())
-    {
-        if ((*it)->id() == aId)
-            device = (*it);
-        ++ it;
-    }
-
-    ComAssertRet (!!device, E_FAIL);
-
-    AutoWriteLock devLock (device);
-
-    /*
-     * Work the state machine.
-     */
-    LogFlowThisFunc(("id={%Vuuid} state=%s aDone=%RTbool name={%s}\n",
-                     device->id().raw(), device->stateName(), aDone, device->name().raw()));
-    bool fRunFilters = false;
-    HRESULT hrc = device->onDetachFromVM(aMachine, aDone, &fRunFilters);
-
-    /*
-     * Run filters if necessary.
-     */
-    if (    SUCCEEDED(hrc)
-        &&  fRunFilters)
-    {
-        Assert(aDone && device->unistate() == kHostUSBDeviceState_HeldByProxy && device->machine().isNull());
-        HRESULT hrc2 = applyAllUSBFilters(device, aMachine);
-        ComAssertComRC(hrc2);
-    }
-    return hrc;
-}
-
-/**
- *  Asks the USB proxy service to capture all currently available USB devices
- *  that match filters of the given machine.
- *
- *  When the request is completed,
- *  IInternalSessionControl::onUSBDeviceDetach() will be called on the given
- *  machine object per every captured USB device.
- *
- *  Called by Console from the VM process (through IInternalMachineControl)
- *  upon VM startup.
- *
- *  @note Locks this object for reading (@todo for writing now, until switched
- *  to the new locking scheme).
- */
-HRESULT Host::autoCaptureUSBDevices (SessionMachine *aMachine)
-{
-    LogFlowThisFunc (("aMachine=%p\n", aMachine));
-
-    AutoWriteLock alock (this);
-    CHECK_READY();
-
-    for (USBDeviceList::iterator it = mUSBDevices.begin();
-         it != mUSBDevices.end();
-         ++ it)
-    {
-        ComObjPtr <HostUSBDevice> device = *it;
-        AutoWriteLock devLock (device);
-        if (   device->unistate() == kHostUSBDeviceState_HeldByProxy
-            || device->unistate() == kHostUSBDeviceState_Unused
-            || device->unistate() == kHostUSBDeviceState_Capturable)
-            applyMachineUSBFilters(aMachine, device);
-    }
-
-    return S_OK;
-}
-
-/**
- *  Replays all filters against all USB devices currently marked as captured
- *  by the given machine (excluding this machine's filters).
- *
- *  Called by Console from the VM process (throug IInternalMachineControl)
- *  upon normal VM termination or by SessionMachine::uninit() upon abnormal
- *  VM termination (from under the Machine/SessionMachine lock).
- *
- *  @note Locks this object for reading (@todo for writing now, until switched
- *  to the new locking scheme).
- */
-HRESULT Host::detachAllUSBDevices (SessionMachine *aMachine, BOOL aDone, bool aAbnormal)
-{
-    AutoWriteLock alock (this);
-    CHECK_READY();
-
-    USBDeviceList::iterator it = mUSBDevices.begin();
-    while (it != mUSBDevices.end())
-    {
-        ComObjPtr <HostUSBDevice> device = *it;
-
-        AutoWriteLock devLock (device);
-
-        if (device->machine() == aMachine)
-        {
-            /*
-             * Same procedure as in detachUSBDevice().
-             */
-            bool fRunFilters = false;
-            HRESULT hrc = device->onDetachFromVM(aMachine, aDone, &fRunFilters, aAbnormal);
-            if (    SUCCEEDED(hrc)
-                &&  fRunFilters)
-            {
-                Assert(aDone && device->unistate() == kHostUSBDeviceState_HeldByProxy && device->machine().isNull());
-                HRESULT hrc2 = applyAllUSBFilters(device, aMachine);
-                ComAssertComRC(hrc2);
-            }
-        }
-        ++ it;
-    }
-
-    return S_OK;
-}
-
 #endif /* VBOX_HOST_USB */
 
@@ -2088 +1897 @@
                      aDevice, aDevice->name().raw(), aDevice->stateName(), aDevice->id().raw()));
 
-    /* add to the collecion */
-    mUSBDevices.push_back (aDevice);
-
     /* apply all filters */
     ComObjPtr <HostUSBDevice> device (aDevice);
@@ -2115 +1921 @@
 
     /*
-     * Remove from the list.
+     * Detach the device from any machine currently using it,
+     * reset all data and uninitialize the device object.
      */
-    Guid id = aDevice->id();
-
-    ComObjPtr <HostUSBDevice> device;
-    Host::USBDeviceList::iterator it = mUSBDevices.begin();
-    while (it != mUSBDevices.end())
-    {
-        if ((*it)->id() == id)
-        {
-            device = (*it);
-            break;
-        }
-        ++ it;
-    }
-
-    AssertReturnVoid (!!device);
-
-    /* remove from the collecion */
-    mUSBDevices.erase (it);
-
-    /* Detach the device from any machine currently using it,
-       reset all data and uninitialize the device object. */
-    device->onPhysicalDetached();
+    aDevice->onPhysicalDetached();
 }
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7460 +7460 @@
         NOREF (rc);
 
-        mParent->host()->detachAllUSBDevices (this, true /* aDone */, true /* aAbnormal */);
+        USBProxyService *service = mParent->host()->usbProxyService();
+        if (service)
+            service->detachAllDevicesFromVM (this, true /* aDone */, true /* aAbnormal */);
     }
 #endif /* VBOX_WITH_USB */
@@ -7662 +7664 @@
 
 #ifdef VBOX_WITH_USB
-    /* if cautureUSBDevice() fails, it must have set extended error info */
-    return mParent->host()->captureUSBDevice (this, aId);
+    /* if captureDeviceForVM() fails, it must have set extended error info */
+    MultiResult rc = mParent->host()->checkUSBProxyService();
+    CheckComRCReturnRC (rc);
+
+    USBProxyService *service = mParent->host()->usbProxyService();
+    AssertReturn (service, E_FAIL);
+    return service->captureDeviceForVM (this, aId);
 #else
     return E_FAIL;
@@ -7680 +7687 @@
 
 #ifdef VBOX_WITH_USB
-    return mParent->host()->detachUSBDevice (this, aId, aDone);
+    USBProxyService *service = mParent->host()->usbProxyService();
+    AssertReturn (service, E_FAIL);
+    return service->detachDeviceFromVM (this, aId, aDone);
 #else
     return E_FAIL;
@@ -7706 +7715 @@
     NOREF (rc);
 
-    return mParent->host()->autoCaptureUSBDevices (this);
+    USBProxyService *service = mParent->host()->usbProxyService();
+    AssertReturn (service, E_FAIL);
+    return service->autoCaptureDevicesForVM (this);
 #else
     return S_OK;
@@ -7734 +7745 @@
     NOREF (rc);
 
-    return mParent->host()->detachAllUSBDevices (this, aDone, false /* aAbnormal */);
+    USBProxyService *service = mParent->host()->usbProxyService();
+    AssertReturn (service, E_FAIL);
+    return service->detachAllDevicesFromVM (this, aDone, false /* aAbnormal */);
 #else
     return S_OK;

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

@@ -106 +106 @@
 
 #ifdef VBOX_WITH_USB
-    /** @todo We could benefit from moving all this USB management into USBProxyService
-     * instead of spreading out like this. Host only needs to keep the host filter list and make
-     * it available to the proxy service. Then only the proxy needs to be intimate friends
-     * with HostUSBDevice, which would simplify the overall picture a bit.
-     * But, I don't dare move anything about this right now though, as I have no time nor any
-     * wishes to provoke the deadlock troll so close to a release... */
-    HRESULT onUSBDeviceFilterChange (HostUSBDeviceFilter *aFilter,
-                                     BOOL aActiveChanged = FALSE);
-    HRESULT captureUSBDevice (SessionMachine *aMachine, INPTR GUIDPARAM aId);
-    HRESULT detachUSBDevice (SessionMachine *aMachine, INPTR GUIDPARAM aId, BOOL aDone);
-    HRESULT autoCaptureUSBDevices (SessionMachine *aMachine);
-    HRESULT detachAllUSBDevices (SessionMachine *aMachine, BOOL aDone, bool aAbnormal);
-
+    /** @name To be moved, they don't belong here.
+     * @{ */
     void onUSBDeviceAttached (HostUSBDevice *aDevice);
     void onUSBDeviceDetached (HostUSBDevice *aDevice);
     void onUSBDeviceStateChanged(HostUSBDevice *aDevice, bool aRunFilters, SessionMachine *aIgnoreMachine);
+    /** @} */
+
+    HRESULT onUSBDeviceFilterChange (HostUSBDeviceFilter *aFilter, BOOL aActiveChanged = FALSE);
 
     /* must be called from under this object's lock */
@@ -160 +152 @@
     }
 
+public:  //temporary - will be moved soon.
     HRESULT applyAllUSBFilters (ComObjPtr <HostUSBDevice> &aDevice,
                                 SessionMachine *aMachine = NULL);
@@ -165 +158 @@
     bool applyMachineUSBFilters (SessionMachine *aMachine,
                                  ComObjPtr <HostUSBDevice> &aDevice);
+private: //temporary
 #endif /* VBOX_WITH_USB */
 
@@ -182 +176 @@
 
 #ifdef VBOX_WITH_USB
-    typedef std::list <ComObjPtr <HostUSBDevice> > USBDeviceList;
-    USBDeviceList mUSBDevices; /**< @todo remove this, use the one maintained by USBProxyService. */
-
     typedef std::list <ComObjPtr <HostUSBDeviceFilter> > USBDeviceFilterList;
     USBDeviceFilterList mUSBDeviceFilters;