Changeset 2967 in vbox for trunk

Timestamp:

May 31, 2007 7:37:43 PM (18 years ago)

Author:

vboxsync

Message:

async capture/hold/release of usb devices. (untested)

Location:

trunk/src/VBox

Files:

• Frontends/VBoxBFE/USBProxyService.h (modified) (1 diff)
• Main/USBProxyService.cpp (modified) (5 diffs)
• Main/include/HostUSBDeviceImpl.h (modified) (2 diffs)
• Main/include/USBProxyService.h (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxBFE/USBProxyService.h

@@ -65 +65 @@
 
     /**
-     * A VM is releaseing a device back to be held or assigned to another VM.
+     * A VM is releasing a device back to be held or assigned to another VM.
      * A port reset should be performed.
      *

trunk/src/VBox/Main/USBProxyService.cpp

@@ -224 +224 @@
                  * Device still there, update the state and move on.
                  */
-                if (DevPtr->updateState (pDevices))
+                if (updateDeviceState (DevPtr, pDevices))
                     mHost->onUSBDeviceStateChanged (DevPtr);
                 It++;
@@ -230 +230 @@
                 pDevices = pDevices->pNext; /* treated as singly linked */
                 freeDevice (pFree);
-                /** @todo detect status changes! */
             }
             else
@@ -255 +254 @@
                 {
                     /*
-                     * DevPtr was detached.
+                     * DevPtr was detached, unless there is a pending async request.
                      */
-                    It = mDevices.erase (It);
-                    mHost->onUSBDeviceDetached (DevPtr);
-                    Log (("USBProxyService::processChanges: detached %p\n", (HostUSBDevice *)DevPtr)); /** @todo add details .*/
+                    /** @todo add a timeout here. */
+                    if (!DevPtr->isStatePendingUnlocked())
+                    {
+                        It = mDevices.erase (It);
+                        mHost->onUSBDeviceDetached (DevPtr);
+                        Log (("USBProxyService::processChanges: detached %p\n", (HostUSBDevice *)DevPtr)); /** @todo add details .*/
+                    }
+                    /* else: operation pending */
                 }
             }
@@ -372 +376 @@
 
 
+bool USBProxyService::updateDeviceStateFake (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice)
+{
+    if (aDevice->isStatePendingUnlocked())
+    {
+        switch (aDevice->pendingStateUnlocked())
+        {
+            case USBDeviceState_USBDeviceCaptured:      aUSBDevice->enmState = USBDEVICESTATE_USED_BY_GUEST; break;
+            case USBDeviceState_USBDeviceHeld:          aUSBDevice->enmState = USBDEVICESTATE_HELD_BY_PROXY; break;
+            case USBDeviceState_USBDeviceAvailable:     aUSBDevice->enmState = USBDEVICESTATE_UNUSED; break;
+            case USBDeviceState_USBDeviceUnavailable:   aUSBDevice->enmState = USBDEVICESTATE_USED_BY_HOST; break;
+            case USBDeviceState_USBDeviceBusy:          aUSBDevice->enmState = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE; break;
+            default:
+                AssertMsgFailed(("%d\n", aDevice->pendingStateUnlocked()));
+                break;
+        }
+    }
+
+    return USBProxyService::updateDeviceState (aDevice, aUSBDevice);
+}
+
+
 
 /* Stubs which the host specific classes overrides: */
@@ -443 +468 @@
 }
 
+
+bool USBProxyService::updateDeviceState (HostUSBDevice *pDevice, PUSBDEVICE pUSBDevice)
+{
+    return pDevice->updateState (pUSBDevice);
+}
+

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

@@ -91 +91 @@
     USBDeviceState_T state() const { return mState; }
 
+    /** Same as state() except you don't need to lock any thing. */
+    USBDeviceState_T stateUnlocked() const
+    {
+        AutoReaderLock (this);
+        return state();
+    }
+
     /* @note Must be called from under the object read lock. */
     USBDeviceState_T pendingState() const { return mPendingState; }
 
+    /** Same as pendingState() except you don't need to lock any thing. */
+    USBDeviceState_T pendingStateUnlocked() const
+    {
+        AutoReaderLock (this);
+        return pendingState();
+    }
+
     /* @note Must be called from under the object read lock. */
     ComObjPtr <SessionMachine, ComWeakRef> &machine() { return mMachine; }
@@ -105 +119 @@
     /* @note Must be called from under the object read lock. */
     bool isStatePending() const { return mIsStatePending; }
+
+    /** Same as isStatePending() except you don't need to lock any thing. */
+    bool isStatePendingUnlocked() const
+    {
+        AutoReaderLock (this);
+        return isStatePending();
+    }
 
     /* @note Must be called from under the object read lock. */

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

@@ -84 +84 @@
 
     /**
+     * Updates the device state.
+     * This is responsible for calling HostUSBDevice::updateState() and check for async completion.
+     *
+     * @returns true if there is a state change.
+     * @param   pDevice     The device in question.
+     * @param   pUSBDevice  The USB device structure for the last enumeration.
+     */
+    virtual bool updateDeviceState (HostUSBDevice *pDevice, PUSBDEVICE pUSBDevice);
+
+    /**
      * Query if the service is active and working.
      *
@@ -150 +160 @@
 
     /**
-     * First call made on the service thread, use it to do 
+     * First call made on the service thread, use it to do
      * thread initialization.
      */
@@ -156 +166 @@
 
     /**
-     * First call made on the service thread, use it to do 
+     * First call made on the service thread, use it to do
      * thread termination.
      */
     virtual void serviceThreadTerm (void);
+
+    /**
+     * Implement fake capture, ++.
+     *
+     * @returns true if there is a state change.
+     * @param   pDevice     The device in question.
+     * @param   pUSBDevice  The USB device structure for the last enumeration.
+     */
+    bool updateDeviceStateFake (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice);
+
 
 public:
@@ -223 +243 @@
     virtual int releaseDevice (HostUSBDevice *aDevice);
     virtual int resetDevice (HostUSBDevice *aDevice);
+    virtual bool updateDeviceState (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice);
 
 protected:
@@ -232 +253 @@
 
 private:
-    /** Reference to the runloop of the service thread. 
+    /** Reference to the runloop of the service thread.
      * This is NULL if the service thread isn't running. */
     CFRunLoopRef mServiceRunLoopRef;
     /** The opaque value returned by DarwinSubscribeUSBNotifications. */
     void *mNotifyOpaque;
-    /** A hack to work around the problem with the usb device enumeration 
+    /** A hack to work around the problem with the usb device enumeration
      * not including newly attached devices. */
     bool mWaitABitNextTime;
@@ -260 +281 @@
     virtual int releaseDevice (HostUSBDevice *aDevice);
     virtual int resetDevice (HostUSBDevice *aDevice);
+    virtual bool updateDeviceState (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice);
 
 protected:
@@ -298 +320 @@
     virtual int releaseDevice (HostUSBDevice *aDevice);
     virtual int resetDevice (HostUSBDevice *aDevice);
+    virtual bool updateDeviceState (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice);
 
 protected: