Changeset 48709 in vbox

Timestamp:

Sep 26, 2013 1:43:05 PM (11 years ago)

Author:

vboxsync

Message:

NatNetwork: reference counting. intoroduces natNetworkRef{Inc,Dec},
if counter is 0 on Inc, corresponding network service is starting.
on Dec exceeding counter 0 network service is stoppping.

Location:

trunk/src/VBox/Main

Files:

• include/VirtualBoxImpl.h (modified) (2 diffs)
• src-server/VirtualBoxImpl.cpp (modified) (6 diffs)

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

@@ -226 +226 @@
                                  IN_BSTR aHostIp, LONG aHostPort,
                                  IN_BSTR aGuestIp, LONG aGuestPort);
+    
+    int natNetworkRefInc(IN_BSTR aNetworkName);
+    int natNetworkRefDec(IN_BSTR aNetworkName);
 
     ComObjPtr<GuestOSType> getUnknownOSType();
@@ -360 +363 @@
     static Bstr sPackageType;
     static Bstr sAPIVersion;
+    static std::map<Bstr, int> sNatNetworkNameToRefCount;
+    static RWLockHandle* spMtxNatNetworkNameToRefCountLock;
 
     static DECLCALLBACK(int) AsyncEventHandler(RTTHREAD thread, void *pvUser);

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

@@ -113 +113 @@
 Bstr VirtualBox::sAPIVersion;
 
+// static
+std::map<Bstr, int> VirtualBox::sNatNetworkNameToRefCount;
+
+// static leaked (todo: find better place to free it.)
+RWLockHandle *VirtualBox::spMtxNatNetworkNameToRefCountLock;
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -366 +371 @@
     if (sAPIVersion.isEmpty())
         sAPIVersion = VBOX_API_VERSION_STRING;
+    if (!spMtxNatNetworkNameToRefCountLock)
+        spMtxNatNetworkNameToRefCountLock = new RWLockHandle(LOCKCLASS_VIRTUALBOXOBJECT);
+
     LogFlowThisFunc(("Version: %ls, Package: %ls, API Version: %ls\n", sVersion.raw(), sPackageType.raw(), sAPIVersion.raw()));
 
@@ -491 +499 @@
             ComObjPtr<NATNetwork> pNATNetwork;
             if (SUCCEEDED(rc = pNATNetwork.createObject()))
+            {
                 rc = pNATNetwork->init(this, net);
-            if (FAILED(rc)) throw rc;
+                AssertComRCReturnRC(rc);
+            }
 
             rc = registerNATNetwork(pNATNetwork, false /* aSaveRegistry */);
-            if (FAILED(rc)) throw rc;
+            AssertComRCReturnRC(rc);
         }
 
@@ -3084 +3094 @@
 }
 
+
+int VirtualBox::natNetworkRefInc(IN_BSTR aNetworkName)
+{
+    AutoWriteLock safeLock(*spMtxNatNetworkNameToRefCountLock COMMA_LOCKVAL_SRC_POS);
+    Bstr name(aNetworkName);
+
+    if (!sNatNetworkNameToRefCount[name])
+    {
+        ComPtr<INATNetwork> nat;
+        HRESULT rc = FindNATNetworkByName(aNetworkName, nat.asOutParam());
+        AssertComRCReturn(rc, -1);
+
+        rc = nat->Start(Bstr("whatever").raw());
+        AssertComRCReturn(rc, -1);
+    }
+
+    sNatNetworkNameToRefCount[name]++;
+    
+    return sNatNetworkNameToRefCount[name];
+}
+
+
+int VirtualBox::natNetworkRefDec(IN_BSTR aNetworkName)
+{
+    AutoWriteLock safeLock(*spMtxNatNetworkNameToRefCountLock COMMA_LOCKVAL_SRC_POS);
+    Bstr name(aNetworkName);
+
+    if (!sNatNetworkNameToRefCount[name])
+        return 0;
+
+    sNatNetworkNameToRefCount[name]--;
+
+    if (!sNatNetworkNameToRefCount[name])
+    {
+        ComPtr<INATNetwork> nat;
+        HRESULT rc = FindNATNetworkByName(aNetworkName, nat.asOutParam());
+        AssertComRCReturn(rc, -1);
+
+        rc = nat->Stop();
+        AssertComRCReturn(rc, -1);
+    }
+
+    return sNatNetworkNameToRefCount[name];
+}
+
+
 /**
  *  @note Locks this object for reading.
@@ -5126 +5182 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturnRC(autoCaller.rc());
 
     AutoCaller natNetworkCaller(aNATNetwork);
-    AssertComRCReturn(natNetworkCaller.rc(), natNetworkCaller.rc());
+    AssertComRCReturnRC(natNetworkCaller.rc());
 
     Bstr name;
     HRESULT rc;
     rc = aNATNetwork->COMGETTER(NetworkName)(name.asOutParam());
-    if (FAILED(rc)) return rc;
-
-    ComPtr<INATNetwork> existing;
-    rc = FindNATNetworkByName(name.raw(), existing.asOutParam());
-    if (SUCCEEDED(rc))
-        return E_INVALIDARG;
+    AssertComRCReturnRC(rc);
+
+    /* returned value isn't 0 and aSaveSettings is true 
+     * means that we create duplicate, otherwise we just load settings.
+     */
+    if (   sNatNetworkNameToRefCount[name] 
+        && aSaveSettings) 
+        AssertComRCReturnRC(E_INVALIDARG);
 
     rc = S_OK;
+
+    sNatNetworkNameToRefCount[name] = 0;
 
     m->allNATNetworks.addChild(aNATNetwork);
@@ -5187 +5247 @@
     AutoCaller natNetworkCaller(aNATNetwork);
     AssertComRCReturn(natNetworkCaller.rc(), natNetworkCaller.rc());
+    
+    Bstr name;
+    HRESULT rc = aNATNetwork->COMGETTER(NetworkName)(name.asOutParam());
+    /* Hm, there're still running clients. */
+    if (FAILED(rc) || sNatNetworkNameToRefCount[name]) 
+        AssertComRCReturnRC(E_INVALIDARG);
 
     m->allNATNetworks.removeChild(aNATNetwork);
-
-    HRESULT rc = S_OK;
 
     if (aSaveSettings)