Changeset 3392 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 3, 2007 2:54:26 PM (18 years ago)

Author:

vboxsync

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

22590

Message:

First part of fix for udevd::chmod vs. VBoxSVC race on attach.

Location:

trunk/src/VBox/Main

Files:

• USBProxyService.cpp (modified) (9 diffs)
• include/HostUSBDeviceImpl.h (modified) (1 diff)
• include/USBProxyService.h (modified) (5 diffs)

trunk/src/VBox/Main/USBProxyService.cpp

@@ -276 +276 @@
                     Log (("USBProxyService::processChanges: attached %p/%p:{.idVendor=%#06x, .idProduct=%#06x, .pszProduct=\"%s\", .pszManufacturer=\"%s\"}\n",
                           (HostUSBDevice *)NewObj, pNew, pNew->idVendor, pNew->idProduct, pNew->pszProduct, pNew->pszManufacturer));
-
-                    /* not really necessary to lock here, but make Assert
-                     * checks happy */
+                    deviceAdded (NewObj, pNew);
+
+                    /* Not really necessary to lock here, but make Assert checks happy. */
                     AutoLock newDevLock (NewObj);
 
@@ -293 +293 @@
                     {
                         It = mDevices.erase (It);
+                        deviceRemoved (DevPtr);
                         mHost->onUSBDeviceDetached (DevPtr);
                         Log (("USBProxyService::processChanges: detached %p\n",
@@ -380 +381 @@
 
 
-/*static*/ void USBProxyService::freeDevice (PUSBDEVICE pDevice)
+/*static*/ void USBProxyService::freeDeviceMembers (PUSBDEVICE pDevice)
 {
     PUSBCONFIG pCfg = pDevice->paConfigurations;
@@ -419 +420 @@
     RTStrFree ((char *)pDevice->pszAddress);
     pDevice->pszAddress = NULL;
-
+}
+
+/*static*/ void USBProxyService::freeDevice (PUSBDEVICE pDevice)
+{
+    freeDeviceMembers (pDevice);
     RTMemFree (pDevice);
-
 }
 
@@ -520 +524 @@
 
 
-int USBProxyService::captureDevice (HostUSBDevice *pDevice)
+int USBProxyService::captureDevice (HostUSBDevice */*aDevice*/)
 {
     return VERR_NOT_IMPLEMENTED;
@@ -526 +530 @@
 
 
-int USBProxyService::holdDevice (HostUSBDevice *pDevice)
+int USBProxyService::holdDevice (HostUSBDevice */*aDevice*/)
 {
     return VERR_NOT_IMPLEMENTED;
@@ -532 +536 @@
 
 
-int USBProxyService::releaseDevice (HostUSBDevice *pDevice)
+int USBProxyService::releaseDevice (HostUSBDevice */*aDevice*/)
 {
     return VERR_NOT_IMPLEMENTED;
@@ -538 +542 @@
 
 
-int USBProxyService::resetDevice (HostUSBDevice *pDevice)
+int USBProxyService::resetDevice (HostUSBDevice */*aDevice*/)
 {
     return VERR_NOT_IMPLEMENTED;
@@ -544 +548 @@
 
 
-bool USBProxyService::updateDeviceState (HostUSBDevice *pDevice, PUSBDEVICE pUSBDevice)
-{
-    AssertReturn (pDevice, false);
-    AssertReturn (pDevice->isLockedOnCurrentThread(), false);
-
-    return pDevice->updateState (pUSBDevice);
-}
-
+bool USBProxyService::updateDeviceState (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice)
+{
+    AssertReturn (aDevice, false);
+    AssertReturn (aDevice->isLockedOnCurrentThread(), false);
+
+    return aDevice->updateState (aUSBDevice);
+}
+
+
+void USBProxyService::deviceAdded (HostUSBDevice */*aDevice*/, PUSBDEVICE /*aUSBDevice*/)
+{
+}
+
+
+void USBProxyService::deviceRemoved (HostUSBDevice */*aDevice*/)
+{
+}
+

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

@@ -140 +140 @@
      * Only used for host devices. */
     PUSBDEVICE mUsb;
+
+    friend class USBProxyService;
+#ifdef __LINUX__
+    friend class USBProxyServiceLinux;
+#endif
 };
 

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

@@ -88 +88 @@
      *
      * @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);
+     * @param   aDevice     The device in question.
+     * @param   aUSBDevice  The USB device structure for the last enumeration.
+     */
+    virtual bool updateDeviceState (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice);
+
+    /**
+     * Add device notification hook for the OS specific code.
+     *
+     * @param   aDevice     The device in question.
+     * @param   aUSBDevice  The USB device structure.
+     */
+    virtual void deviceAdded (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice);
+
+    /**
+     * Remove device notification hook for the OS specific code.
+     *
+     * @param   aDevice     The device in question.
+     */
+    virtual void deviceRemoved (HostUSBDevice *aDevice);
 
     /**
@@ -182 +197 @@
 
 public:
+    /**
+     * Free all the members of a USB device returned by getDevice().
+     *
+     * @param   pDevice     Pointer to the device.
+     */
+    static void freeDeviceMembers (PUSBDEVICE pDevice);
+
     /**
      * Free one USB device returned by getDevice().
@@ -282 +304 @@
     virtual int resetDevice (HostUSBDevice *aDevice);
     virtual bool updateDeviceState (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice);
+    virtual void deviceAdded (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice);
 
 protected:
@@ -287 +310 @@
     virtual int interruptWait (void);
     virtual PUSBDEVICE getDevices (void);
+    int addDeviceToChain (PUSBDEVICE pDev, PUSBDEVICE *ppFirst, PUSBDEVICE **pppNext, int rc);
 
 private:
@@ -299 +323 @@
     /** The root of usbfs. */
     Utf8Str mUsbfsRoot;
+    /** Number of 500ms polls left to do. See usbDeterminState for details. */
+    unsigned mUdevPolls;
 };
 # endif /* __LINUX__ */