儲存庫 vbox 的更動 40491

時間撮記:

2012-3-15 下午08:52:05 (13 年 以前)

作者:

vboxsync

訊息:

Main/NetworkAdapter: Take the easy solution out of the reference hell created by the SessionMachine logic. Since the BandwidthGroup objects are not logically located below NetworkAdapter (they are under Machine/BandwidthControl) it is effectively impossible to get the right references in the object. Querying through the appropriate Machine object is guaranteed to give the right result.

位置:

trunk/src/VBox/Main

檔案:

• include/NetworkAdapterImpl.h (修改) (1 筆差異)
• src-server/NetworkAdapterImpl.cpp (修改) (5 筆差異)

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

@@ -70 +70 @@
         settings::StringsMap mGenericProperties;
         ULONG mBootPriority;
-        ComObjPtr<BandwidthGroup> mBandwidthGroup;
+        Utf8Str mBandwidthGroup;
     };
 

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

@@ -1234 +1234 @@
     data.ulBootPriority = mData->mBootPriority;
 
-    if (mData->mBandwidthGroup.isNull())
-        data.strBandwidthGroup = "";
-    else
-        data.strBandwidthGroup = mData->mBandwidthGroup->getName();
+    data.strBandwidthGroup = mData->mBandwidthGroup;
 
     data.type = mData->mAdapterType;
@@ -1309 +1306 @@
         if (mPeer)
         {
-            if (!mData->mBandwidthGroup.isNull())
-            {
-                Assert(!mData->mBandwidthGroup->getPeer().isNull() && mData->mBandwidthGroup->getPeer()->getPeer().isNull());
-                mData->mBandwidthGroup = mData->mBandwidthGroup->getPeer();
-            }
             /* attach new data to the peer and reshare it */
             mPeer->mData.attach(mData);
@@ -1403 +1395 @@
     CheckComArgOutPointerValid(aBwGroup);
 
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    mData->mBandwidthGroup.queryInterfaceTo(aBwGroup);
+    HRESULT hrc = S_OK;
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (mData->mBandwidthGroup.isNotEmpty())
+    {
+        ComObjPtr<BandwidthGroup> pBwGroup;
+        hrc = mParent->getBandwidthGroup(mData->mBandwidthGroup, 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);
+    }
 
     LogFlowThisFuncLeave();
-    return S_OK;
+    return hrc;
 }
 
@@ -1427 +1430 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (mData->mBandwidthGroup != aBwGroup)
-    {
+    Utf8Str strBwGroup;
+    if (aBwGroup)
+        strBwGroup = static_cast<BandwidthGroup*>(aBwGroup)->getName();
+    if (mData->mBandwidthGroup != strBwGroup)
+    {
+        ComObjPtr<BandwidthGroup> pBwGroup;
+        if (!strBwGroup.isEmpty())
+        {
+            HRESULT hrc = mParent->getBandwidthGroup(strBwGroup, pBwGroup, false /* fSetError */);
+
+            Assert(SUCCEEDED(hrc)); /* This is not allowed to fail because the existence of the group was checked when it was attached. */
+        }
+
         mData.backup();
 
-        updateBandwidthGroup(static_cast<BandwidthGroup*>(aBwGroup));
+        updateBandwidthGroup(pBwGroup);
 
         m_fModified = true;
@@ -1454 +1468 @@
     Assert(isWriteLockOnCurrentThread());
 
+    ComObjPtr<BandwidthGroup> pOldBwGroup;
+    if (!mData->mBandwidthGroup.isEmpty())
+        {
+            HRESULT hrc = mParent->getBandwidthGroup(mData->mBandwidthGroup, pOldBwGroup, false /* fSetError */);
+
+            Assert(SUCCEEDED(hrc)); /* This is not allowed to fail because the existence of the group was checked when it was attached. */
+        }
+
     mData.backup();
-    if (!mData->mBandwidthGroup.isNull())
-    {
-        mData->mBandwidthGroup->release();
-        mData->mBandwidthGroup.setNull();
+    if (!pOldBwGroup.isNull())
+    {
+        pOldBwGroup->release();
+        mData->mBandwidthGroup = Utf8Str::Empty;
     }
 
     if (aBwGroup)
     {
-        mData->mBandwidthGroup = aBwGroup;
-        mData->mBandwidthGroup->reference();
+        mData->mBandwidthGroup = aBwGroup->getName();
+        aBwGroup->reference();
     }