Changeset 48989 in vbox

Timestamp:

Oct 9, 2013 7:05:31 AM (11 years ago)

Author:

vboxsync

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

89707

Message:

Main/NetworkAdapterImpl.cpp: Avoids lock drops and re-acquirings on NAT Networking changes in NetworkAdapter::COMSETTER(NATNetwork)(...) and NetworkAdapter::COMSETTER(AttachmentType)(...)

Location:

trunk/src/VBox/Main

Files:

• include/NetworkAdapterImpl.h (modified) (1 diff)
• src-server/NetworkAdapterImpl.cpp (modified) (7 diffs)

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

@@ -155 +155 @@
     HRESULT updateMacAddress(Utf8Str aMacAddress);
     void updateBandwidthGroup(BandwidthGroup *aBwGroup);
-    HRESULT checkAndSwitchFromNatNetworking();
+    HRESULT checkAndSwitchFromNatNetworking(IN_BSTR aNatNetworkName);
     HRESULT switchToNatNetworking(IN_BSTR aNatNetworkName);
 

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

@@ -484 +484 @@
         }
 
-#if 0 // later
-        alock.release();
-        HRESULT hrc = checkAndSwitchFromNatNetworking();
-        if (FAILED(hrc))
-            return hrc;
-        alock.acquire();
-#endif
-
+        NetworkAttachmentType_T oldAttachmentType = mData->mAttachmentType;
         mData->mAttachmentType = aAttachmentType;
-
-#if 0 // later
-        alock.release();
-        if (aAttachmentType == NetworkAttachmentType_NATNetwork)
-        {
-            hrc = switchToNatNetworking(mData->mNATNetwork.raw());
-            if (FAILED(hrc))
-                return hrc;
-        }
-        alock.acquire();
-#endif
 
         m_fModified = true;
@@ -512 +494 @@
         mParent->setModified(Machine::IsModified_NetworkAdapters);
         mlock.release();
+
+        if (oldAttachmentType == NetworkAttachmentType_NATNetwork)
+            checkAndSwitchFromNatNetworking(mData->mNATNetwork.raw());
+
+        if (aAttachmentType == NetworkAttachmentType_NATNetwork)
+            switchToNatNetworking(mData->mNATNetwork.raw());
 
         /* Adapt the CFGM logic and notify the guest => changeAdapter=TRUE. */
@@ -728 +716 @@
     {
 
-        HRESULT hrc;
         /* if an empty/null string is to be set, host only interface must be
          * turned off */
@@ -740 +727 @@
         mData.backup();
 
-        alock.release();
-
-        hrc = checkAndSwitchFromNatNetworking();
-        if (FAILED(hrc))
-            return hrc;
-
-        hrc = switchToNatNetworking(aNATNetwork);
-        if (FAILED(hrc))
-            return hrc;
-
-        alock.acquire();
-
+        Bstr oldNatNetworkName = mData->mNATNetwork;
         mData->mNATNetwork = aNATNetwork;
 
@@ -761 +737 @@
         mParent->setModified(Machine::IsModified_NetworkAdapters);
         mlock.release();
+
+        checkAndSwitchFromNatNetworking(oldNatNetworkName.raw());
+
+        switchToNatNetworking(aNATNetwork);
 
         /* When changing the host adapter, adapt the CFGM logic to make this
@@ -1585 +1565 @@
 
 
-HRESULT NetworkAdapter::checkAndSwitchFromNatNetworking()
+HRESULT NetworkAdapter::checkAndSwitchFromNatNetworking(IN_BSTR networkName)
 {
     HRESULT hrc;
@@ -1599 +1579 @@
         Bstr bstrName;
         hrc = mParent->COMGETTER(Name)(bstrName.asOutParam());
-        LogRel(("VM '%ls' stops using NAT network '%ls'\n", bstrName.raw(), mData->mNATNetwork.raw()));
-        int natCount = mParent->getVirtualBox()->natNetworkRefDec(mData->mNATNetwork.raw());
+        LogRel(("VM '%ls' stops using NAT network '%ls'\n", bstrName.raw(), networkName));
+        int natCount = mParent->getVirtualBox()->natNetworkRefDec(networkName);
         if (natCount == -1)
             return E_INVALIDARG; /* no such network */