Changeset 36058 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Feb 22, 2011 11:11:22 PM (14 years ago)

Author:

vboxsync

Message:

Main/BandwidthControl: Don't use direct references to bandwidth group objects in the medium attachment object. It will point to the old uninitialized instance if the settings are changed. Uses the name of the bandwidth group now instead without changing the public interface to make a backport to 4.0 possible

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (6 diffs)
• MediumAttachmentImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -3709 +3709 @@
                           aType,
                           fIndirect,
-                          NULL);
+                          Utf8Str::Empty);
     if (FAILED(rc)) return rc;
 
@@ -3871 +3871 @@
     AutoWriteLock attLock(pAttach COMMA_LOCKVAL_SRC_POS);
 
-    pAttach->updateBandwidthGroup(group);
+    const Utf8Str strBandwidthGroupOld = pAttach->getBandwidthGroup();
+    if (strBandwidthGroupOld.isNotEmpty())
+    {
+        /* Get the bandwidth group object and release it - this must not fail. */
+        ComObjPtr<BandwidthGroup> pBandwidthGroupOld;
+        rc = getBandwidthGroup(strBandwidthGroupOld, pBandwidthGroupOld, false);
+        Assert(SUCCEEDED(rc));
+
+        pBandwidthGroupOld->release();
+        pAttach->updateBandwidthGroup(Utf8Str::Empty);
+    }
+
+    if (!group.isNull())
+    {
+        group->reference();
+        pAttach->updateBandwidthGroup(group->getName());
+    }
 
     return S_OK;
@@ -7746 +7762 @@
                                 mUserData->s.strName.c_str(),
                                 mData->m_strConfigFileFull.c_str());
+            pBwGroup->reference();
         }
 
@@ -7758 +7775 @@
                                dev.deviceType,
                                dev.fPassThrough,
-                               pBwGroup);
+                               pBwGroup.isNull() ? Utf8Str::Empty : pBwGroup->getName());
         if (FAILED(rc)) break;
 
@@ -8686 +8703 @@
         MediumAttachment *pAttach = *it;
         Medium *pMedium = pAttach->getMedium();
-        BandwidthGroup *pBwGroup = pAttach->getBandwidthGroup();
 
         dev.deviceType = pAttach->getType();
@@ -8700 +8716 @@
         }
 
-        if (pBwGroup)
-        {
-            dev.strBwGroup = pBwGroup->getName();
-        }
+        dev.strBwGroup = pAttach->getBandwidthGroup();
 
         data.llAttachedDevices.push_back(dev);

trunk/src/VBox/Main/src-server/MediumAttachmentImpl.cpp

@@ -45 +45 @@
 
     ComObjPtr<Medium>   pMedium;
-    ComObjPtr<BandwidthGroup> pBwGroup;
     /* Since MediumAttachment is not a first class citizen when it
      * comes to managing settings, having a reference to the storage
@@ -52 +51 @@
      * substantial changes to MediumImpl.cpp. */
     const Bstr          bstrControllerName;
+    /* Same counts for the assigned bandwidth group */
+    Utf8Str             strBandwidthGroup;
     const LONG          lPort;
     const LONG          lDevice;
@@ -110 +111 @@
                                DeviceType_T aType,
                                bool aPassthrough,
-                               BandwidthGroup *aBandwidthGroup)
+                               const Utf8Str &strBandwidthGroup)
 {
     LogFlowThisFuncEnter();
@@ -128 +129 @@
     m->bd.allocate();
     m->bd->pMedium = aMedium;
-    if (aBandwidthGroup)
-        aBandwidthGroup->reference();
-    m->bd->pBwGroup = aBandwidthGroup;
+    unconst(m->bd->strBandwidthGroup) = strBandwidthGroup;
     unconst(m->bd->bstrControllerName) = aControllerName;
     unconst(m->bd->lPort)   = aPort;
@@ -290 +289 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    m->bd->pBwGroup.queryInterfaceTo(aBwGroup);
-
-    return S_OK;
+    HRESULT hrc = S_OK;
+    if (m->bd->strBandwidthGroup.isNotEmpty())
+    {
+        ComObjPtr<BandwidthGroup> pBwGroup;
+        hrc = m->pMachine->getBandwidthGroup(m->bd->strBandwidthGroup, pBwGroup, true /* fSetError */);
+
+        Assert(SUCCEEDED(hrc)); /* This is not allowed to fail because the existence of the group was checked when it was attached. */
+
+        if (SUCCEEDED(hrc))
+            pBwGroup.queryInterfaceTo(aBwGroup);
+    }
+
+    return hrc;
 }
 
@@ -318 +327 @@
 void MediumAttachment::commit()
 {
-    LogFlowThisFuncEnter();
+    LogFlowThisFunc(("ENTER - %s\n", getLogName()));
 
     /* sanity */
@@ -329 +338 @@
         m->bd.commit();
 
-    LogFlowThisFuncLeave();
+    LogFlowThisFunc(("LEAVE - %s\n", getLogName()));
 }
 
@@ -373 +382 @@
 }
 
-const ComObjPtr<BandwidthGroup>& MediumAttachment::getBandwidthGroup() const
-{
-    return m->bd->pBwGroup;
+const Utf8Str& MediumAttachment::getBandwidthGroup() const
+{
+    return m->bd->strBandwidthGroup;
 }
 
@@ -407 +416 @@
 }
 
-void MediumAttachment::updateBandwidthGroup(const ComObjPtr<BandwidthGroup> &aBandwidthGroup)
-{
+void MediumAttachment::updateBandwidthGroup(const Utf8Str &aBandwidthGroup)
+{
+    LogFlowThisFuncEnter();
     Assert(isWriteLockOnCurrentThread());
 
     m->bd.backup();
-    if (!aBandwidthGroup.isNull())
-        aBandwidthGroup->reference();
-
-    if (!m->bd->pBwGroup.isNull())
-    {
-        m->bd->pBwGroup->release();
-    }
-    m->bd->pBwGroup = aBandwidthGroup;
-}
-
+    m->bd->strBandwidthGroup = aBandwidthGroup;
+
+    LogFlowThisFuncLeave();
+}
+