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

Timestamp:

Apr 15, 2010 9:18:31 AM (15 years ago)

Author:

vboxsync

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

60109

Message:

Main/HostHardwareLinux: generalised the VBoxMainHotplugWaiter class to allow for runtime implementation selection

File:

• trunk/src/VBox/Main/include/HostHardwareLinux.h (modified) (5 diffs)

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

@@ -44 +44 @@
         /** The device node of the drive. */
         iprt::MiniString mDevice;
-        /** The hal unique device identifier, if available. */
+        /** A unique identifier for the device, if available.  This should be
+         * kept consistant accross different probing methods of a given
+         * platform if at all possible. */
         iprt::MiniString mUdi;
         /** A textual description of the drive. */
@@ -124 +126 @@
         /** The device node of the device. */
         iprt::MiniString mDevice;
-        /** The sysfs path of the device. */
+        /** The system identifier of the device.  Specific to the probing
+         * method. */
         iprt::MiniString mSysfsPath;
         /** Type for the list of interfaces. */
         typedef std::vector<iprt::MiniString> InterfaceList;
-        /** The sysfs paths of the device's interfaces. */
+        /** The system IDs of the device's interfaces. */
         InterfaceList mInterfaces;
 
         /** Constructors */
         USBDeviceInfo(const iprt::MiniString &aDevice,
-                      const iprt::MiniString &aSysfsPath)
+                      const iprt::MiniString &aSystemID)
             : mDevice(aDevice),
-              mSysfsPath(aSysfsPath)
+              mSysfsPath(aSystemID)
         { }
     };
@@ -172 +175 @@
 /** Convenience typedef. */
 typedef VBoxMainUSBDeviceInfo::USBDeviceInfo::InterfaceList USBInterfaceList;
+
+/** Implementation of the hotplug waiter class below */
+class VBoxMainHotplugWaiterImpl
+{
+public:
+    VBoxMainHotplugWaiterImpl (void) {}
+    virtual ~VBoxMainHotplugWaiterImpl (void) {}
+    /** @copydoc VBoxMainHotplugWaiter::Wait */
+    virtual int Wait (RTMSINTERVAL cMillies) = 0;
+    /** @copydoc VBoxMainHotplugWaiter::Interrupt */
+    virtual void Interrupt (void) = 0;
+};
 
 /**
@@ -181 +196 @@
 class VBoxMainHotplugWaiter
 {
-    /** Opaque context struct. */
-    struct Context;
-
-    /** Opaque waiter context. */
-    Context *mContext;
-public:
-    /** Constructor */
+    /** Class implementation. */
+    VBoxMainHotplugWaiterImpl *mImpl;
+public:
+    /** Constructor.  Responsible for selecting the implementation. */
     VBoxMainHotplugWaiter (void);
     /** Destructor. */
-    ~VBoxMainHotplugWaiter (void);
+    ~VBoxMainHotplugWaiter (void)
+    {
+        delete mImpl;
+    }
     /**
      * Wait for a hotplug event.
@@ -202 +217 @@
      * @param    cMillies   How long to wait for at most.
      */
-    int Wait (RTMSINTERVAL cMillies);
+    int Wait (RTMSINTERVAL cMillies)
+    {
+        return mImpl->Wait(cMillies);
+    }
     /**
      * Interrupts an active wait.  In the current implementation, the wait
      * may not return until up to two seconds after calling this method.
      */
-    void Interrupt (void);
+    void Interrupt (void)
+    {
+        mImpl->Interrupt();
+    }
 };