Changeset 23279 in vbox for trunk/src/VBox/Main/HostImpl.cpp

Timestamp:

Sep 24, 2009 10:46:57 AM (15 years ago)

Author:

vboxsync

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

52765

Message:

Main: remove VirtualBoxBaseWithChildren, convert IHost away from using it

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -159 +159 @@
 
 #ifdef VBOX_WITH_USB
-    USBDeviceFilterList     llUSBDeviceFilters;
+    WriteLockHandle         treeLock;                   // protects the below two lists
+
+    USBDeviceFilterList     llChildren;                 // all USB device filters
+    USBDeviceFilterList     llUSBDeviceFilters;         // USB device filters in use by the USB proxy service
 
     /** Pointer to the USBProxyService object. */
@@ -337 +340 @@
     delete m->pHostPowerService;
 
+#ifdef VBOX_WITH_USB
     /* uninit all USB device filters still referenced by clients */
-    uninitDependentChildren();
-
-#ifdef VBOX_WITH_USB
+    for (USBDeviceFilterList::iterator it = m->llChildren.begin();
+         it != m->llChildren.end();
+         ++it)
+    {
+        ComObjPtr<HostUSBDeviceFilter> &pChild = *it;
+        pChild->uninit();
+    }
+
+    m->llChildren.clear();
+
     m->llUSBDeviceFilters.clear();
 #endif
@@ -902 +913 @@
     CheckComRCReturnRC(rc);
 
-    return m->pUSBProxyService->getDeviceCollection (ComSafeArrayOutArg(aUSBDevices));
+    return m->pUSBProxyService->getDeviceCollection(ComSafeArrayOutArg(aUSBDevices));
 
 #else
@@ -924 +935 @@
     CheckComRCReturnRC(autoCaller.rc());
 
-    AutoWriteLock alock(this);
+    AutoMultiWriteLock2 alock(this->lockHandle(), &m->treeLock);
 
     MultiResult rc = checkUSBProxyService();
     CheckComRCReturnRC(rc);
 
-    SafeIfaceArray<IHostUSBDeviceFilter> collection (m->llUSBDeviceFilters);
+    SafeIfaceArray<IHostUSBDeviceFilter> collection(m->llUSBDeviceFilters);
     collection.detachTo(ComSafeArrayOutArg(aUSBDeviceFilters));
 
@@ -1258 +1269 @@
     CheckComRCReturnRC(autoCaller.rc());
 
-    AutoWriteLock alock(this);
+    AutoMultiWriteLock2 alock(this->lockHandle(), &m->treeLock);
 
     MultiResult rc = checkUSBProxyService();
     CheckComRCReturnRC(rc);
 
-    ComObjPtr<HostUSBDeviceFilter> filter = getDependentChild (aFilter);
-    if (!filter)
-        return setError (VBOX_E_INVALID_OBJECT_STATE,
-            tr ("The given USB device filter is not created within "
-                "this VirtualBox instance"));
-
-    if (filter->mInList)
+    ComObjPtr<HostUSBDeviceFilter> pFilter;
+    for (USBDeviceFilterList::iterator it = m->llChildren.begin();
+         it != m->llChildren.end();
+         ++it)
+    {
+        if (*it == aFilter)
+        {
+            pFilter = *it;
+            break;
+        }
+    }
+    if (pFilter.isNull())
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("The given USB device filter is not created within this VirtualBox instance"));
+
+    if (pFilter->mInList)
         return setError (E_INVALIDARG,
             tr ("The given USB device filter is already in the list"));
@@ -1277 +1297 @@
     std::advance (it, aPosition);
     /* ...and insert */
-    m->llUSBDeviceFilters.insert (it, filter);
-    filter->mInList = true;
+    m->llUSBDeviceFilters.insert(it, pFilter);
+    pFilter->mInList = true;
 
     /* notify the proxy (only when the filter is active) */
-    if (m->pUSBProxyService->isActive() && filter->data().mActive)
-    {
-        ComAssertRet (filter->id() == NULL, E_FAIL);
-        filter->id() = m->pUSBProxyService->insertFilter (&filter->data().mUSBFilter);
+    if (    m->pUSBProxyService->isActive()
+         && pFilter->data().mActive)
+    {
+        ComAssertRet(pFilter->id() == NULL, E_FAIL);
+        pFilter->id() = m->pUSBProxyService->insertFilter(&pFilter->data().mUSBFilter);
     }
 
@@ -1308 +1329 @@
     CheckComRCReturnRC(autoCaller.rc());
 
-    AutoWriteLock alock(this);
+    AutoMultiWriteLock2 alock(this->lockHandle(), &m->treeLock);
 
     MultiResult rc = checkUSBProxyService();
@@ -1331 +1352 @@
         /* ...and remove */
         filter->mInList = false;
-        m->llUSBDeviceFilters.erase (it);
+        m->llUSBDeviceFilters.erase(it);
     }
 
@@ -1591 +1612 @@
     CheckComRCReturnRC(autoCaller.rc());
 
-    AutoWriteLock alock(this);
+    AutoMultiWriteLock2 alock(this->lockHandle(), &m->treeLock);
 
     HRESULT rc = S_OK;
@@ -1628 +1649 @@
     CheckComRCReturnRC(autoCaller.rc());
 
-    AutoWriteLock alock(this);
+    AutoReadLock alock(&m->treeLock);
 
 #ifdef VBOX_WITH_USB
@@ -1653 +1674 @@
 {
     return m->pUSBProxyService;
+}
+
+HRESULT Host::addChild(HostUSBDeviceFilter *pChild)
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(&m->treeLock);
+
+    m->llChildren.push_back(pChild);
+
+    return S_OK;
+}
+
+HRESULT Host::removeChild(HostUSBDeviceFilter *pChild)
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(&m->treeLock);
+
+    for (USBDeviceFilterList::iterator it = m->llChildren.begin();
+         it != m->llChildren.end();
+         ++it)
+    {
+        if (*it == pChild)
+        {
+            m->llChildren.erase(it);
+            break;
+        }
+    }
+
+    return S_OK;
 }
 
@@ -1717 +1771 @@
 void Host::getUSBFilters(Host::USBDeviceFilterList *aGlobalFilters)
 {
-    AutoWriteLock alock(this);
+    AutoReadLock alock(&m->treeLock);
 
     *aGlobalFilters = m->llUSBDeviceFilters;
@@ -2229 +2283 @@
 
 #ifdef VBOX_WITH_USB
-ComObjPtr<HostUSBDeviceFilter> Host::getDependentChild (IHostUSBDeviceFilter *aFilter)
-{
-    VirtualBoxBase *child = VirtualBoxBaseWithChildren::getDependentChild(ComPtr<IUnknown>(aFilter));
-    return child
-            ? dynamic_cast<HostUSBDeviceFilter*>(child)
-            : NULL;
-}
-
-
 /**
  *  Checks for the presense and status of the USB Proxy Service.