Changeset 93628 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 6, 2022 11:44:05 PM (3 years ago)

Author:

vboxsync

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

149773

Message:

VMM/PDMNetShaper,Main,DrvNetShaper: Moved the network shaper data off the hyper heap and into the VM structure. bugref:10093 bugref:5582

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• src-server/BandwidthControlImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1464 +1464 @@
          * Bandwidth groups.
          */
+        ComPtr<IBandwidthControl> bwCtrl;
+        hrc = pMachine->COMGETTER(BandwidthControl)(bwCtrl.asOutParam());                   H();
+
+        com::SafeIfaceArray<IBandwidthGroup> bwGroups;
+        hrc = bwCtrl->GetAllBandwidthGroups(ComSafeArrayAsOutParam(bwGroups));              H();
+
         PCFGMNODE pAc;
+        InsertConfigNode(pPDM, "AsyncCompletion", &pAc);
         PCFGMNODE pAcFile;
+        InsertConfigNode(pAc,  "File", &pAcFile);
         PCFGMNODE pAcFileBwGroups;
-        ComPtr<IBandwidthControl> bwCtrl;
-        com::SafeIfaceArray<IBandwidthGroup> bwGroups;
-
-        hrc = pMachine->COMGETTER(BandwidthControl)(bwCtrl.asOutParam());                   H();
-
-        hrc = bwCtrl->GetAllBandwidthGroups(ComSafeArrayAsOutParam(bwGroups));              H();
-
-        InsertConfigNode(pPDM, "AsyncCompletion", &pAc);
-        InsertConfigNode(pAc,  "File", &pAcFile);
         InsertConfigNode(pAcFile,  "BwGroups", &pAcFileBwGroups);
 #ifdef VBOX_WITH_NETSHAPER
         PCFGMNODE pNetworkShaper;
+        InsertConfigNode(pPDM, "NetworkShaper",  &pNetworkShaper);
         PCFGMNODE pNetworkBwGroups;
-
-        InsertConfigNode(pPDM, "NetworkShaper",  &pNetworkShaper);
         InsertConfigNode(pNetworkShaper, "BwGroups", &pNetworkBwGroups);
 #endif /* VBOX_WITH_NETSHAPER */
@@ -1488 +1486 @@
         {
             Bstr strName;
-            LONG64 cMaxBytesPerSec;
-            BandwidthGroupType_T enmType;
-
             hrc = bwGroups[i]->COMGETTER(Name)(strName.asOutParam());                       H();
-            hrc = bwGroups[i]->COMGETTER(Type)(&enmType);                                   H();
-            hrc = bwGroups[i]->COMGETTER(MaxBytesPerSec)(&cMaxBytesPerSec);                 H();
-
             if (strName.isEmpty())
                 return pVMM->pfnVMR3SetError(pUVM, VERR_CFGM_NO_NODE, RT_SRC_POS, N_("No bandwidth group name specified"));
+            BandwidthGroupType_T enmType = BandwidthGroupType_Null;
+            hrc = bwGroups[i]->COMGETTER(Type)(&enmType);                                   H();
+            LONG64 cMaxBytesPerSec = 0;
+            hrc = bwGroups[i]->COMGETTER(MaxBytesPerSec)(&cMaxBytesPerSec);                 H();
 
             if (enmType == BandwidthGroupType_Disk)

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

@@ -28 +28 @@
 #include <iprt/cpp/utils.h>
 #include <VBox/com/array.h>
+#include <VBox/param.h>
 #include <algorithm>
 
@@ -392 +393 @@
                                                LONG64 aMaxBytesPerSec)
 {
+    /*
+     * Validate input.
+     */
     if (aMaxBytesPerSec < 0)
-        return setError(E_INVALIDARG,
-                        tr("Bandwidth group limit cannot be negative"));
-
-    /* the machine needs to be mutable */
+        return setError(E_INVALIDARG, tr("Bandwidth group limit cannot be negative"));
+    switch (aType)
+    {
+        case BandwidthGroupType_Null: /*??*/
+        case BandwidthGroupType_Disk:
+            break;
+        case BandwidthGroupType_Network:
+            if (aName.length() > PDM_NET_SHAPER_MAX_NAME_LEN)
+                return setError(E_INVALIDARG, tr("Bandwidth name is too long: %zu, max %u"),
+                                aName.length(), PDM_NET_SHAPER_MAX_NAME_LEN);
+            break;
+        default:
+            AssertFailedReturn(setError(E_INVALIDARG, tr("Invalid group type: %d"), aType));
+    }
+    if (aName.isEmpty())
+        return setError(E_INVALIDARG, tr("Bandwidth group name must not be empty")); /* ConsoleImpl2.cpp fails then */
+
+    /*
+     * The machine needs to be mutable:
+     */
     AutoMutableOrSavedStateDependency adep(m->pParent);
-    if (FAILED(adep.rc())) return adep.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    /* try to find one with the name first. */
-    ComObjPtr<BandwidthGroup> group;
-    HRESULT rc = i_getBandwidthGroupByName(aName, group, false /* aSetError */);
-
-    if (SUCCEEDED(rc))
-        return setError(VBOX_E_OBJECT_IN_USE,
-                        tr("Bandwidth group named '%s' already exists"),
-                        aName.c_str());
-
-    group.createObject();
-
-    rc = group->init(this, aName, aType, aMaxBytesPerSec);
-    if (FAILED(rc)) return rc;
-
-    m->pParent->i_setModified(Machine::IsModified_BandwidthControl);
-    m->llBandwidthGroups.backup();
-    m->llBandwidthGroups->push_back(group);
-
-    return S_OK;
+    HRESULT hrc = adep.rc();
+    if (SUCCEEDED(hrc))
+    {
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+        /*
+         * Check that the group doesn't already exist:
+         */
+        ComObjPtr<BandwidthGroup> group;
+        hrc = i_getBandwidthGroupByName(aName, group, false /* aSetError */);
+        if (FAILED(hrc))
+        {
+            /*
+             * There is an upper limit of the number of network groups imposed by PDM.
+             */
+            size_t cNetworkGroups = 0;
+            if (aType == BandwidthGroupType_Network)
+                for (BandwidthGroupList::const_iterator it = m->llBandwidthGroups->begin();
+                     it != m->llBandwidthGroups->end();
+                     ++it)
+                    if ((*it)->i_getType() == BandwidthGroupType_Network)
+                        cNetworkGroups++;
+            if (cNetworkGroups < PDM_NET_SHAPER_MAX_GROUPS)
+            {
+                /*
+                 * Create the new group.
+                 */
+                hrc = group.createObject();
+                if (SUCCEEDED(hrc))
+                {
+                    hrc = group->init(this, aName, aType, aMaxBytesPerSec);
+                    if (SUCCEEDED(hrc))
+                    {
+                        /*
+                         * Add it to the settings.
+                         */
+                        m->pParent->i_setModified(Machine::IsModified_BandwidthControl);
+                        m->llBandwidthGroups.backup();
+                        m->llBandwidthGroups->push_back(group);
+                        hrc = S_OK;
+                    }
+                }
+            }
+            else
+                hrc = setError(E_FAIL, tr("Too many network bandwidth groups (max %u)"), PDM_NET_SHAPER_MAX_GROUPS);
+        }
+        else
+            hrc = setError(VBOX_E_OBJECT_IN_USE, tr("Bandwidth group named '%s' already exists"), aName.c_str());
+    }
+    return hrc;
 }