Changeset 41882 in vbox for trunk

Timestamp:

Jun 22, 2012 10:58:47 AM (13 years ago)

Author:

vboxsync

Message:

NetShaper: Runtime shaper disabling support (#5582)

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageBandwidthControl.cpp (modified) (1 diff)
• Main/src-server/BandwidthControlImpl.cpp (modified) (1 diff)
• Main/src-server/BandwidthGroupImpl.cpp (modified) (1 diff)
• VMM/VMMR3/PDMNetShaper.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp

@@ -82 +82 @@
             return "Invalid limit specifier\n";
     }
-    if (*pLimit <= 0)
-        return "Limit must be positive\n";
+    if (*pLimit < 0)
+        return "Limit cannot be negative\n";
     if (*pLimit > INT64_MAX / iMultiplier)
         return "Limit is too big\n";

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

@@ -412 +412 @@
 STDMETHODIMP BandwidthControl::CreateBandwidthGroup(IN_BSTR aName, BandwidthGroupType_T aType, LONG64 aMaxBytesPerSec)
 {
-    if (aMaxBytesPerSec <= 0)
+    if (aMaxBytesPerSec < 0)
         return setError(E_INVALIDARG,
-                        tr("Bandwidth group limit must be positive"));
+                        tr("Bandwidth group limit cannot be negative"));
 
     AutoCaller autoCaller(this);

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

@@ -284 +284 @@
 STDMETHODIMP BandwidthGroup::COMSETTER(MaxBytesPerSec)(LONG64 aMaxBytesPerSec)
 {
-    if (aMaxBytesPerSec <= 0)
+    if (aMaxBytesPerSec < 0)
         return setError(E_INVALIDARG,
-                        tr("Bandwidth group limit must be positive"));
+                        tr("Bandwidth group limit cannot be negative"));
 
     AutoCaller autoCaller(this);

trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp

@@ -243 +243 @@
     //int rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);
 
+    /* Check if the group is disabled. */
+    if (pBwGroup->cbTransferPerSecMax == 0)
+        return;
+
     PPDMNSFILTER pFilter = pBwGroup->pFiltersHead;
     while (pFilter)
@@ -370 +374 @@
     int rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);
     bool fAllowed = true;
-    /* Re-fill the bucket first */
-    uint64_t tsNow = RTTimeSystemNanoTS();
-    uint32_t uTokensAdded = (tsNow - pBwGroup->tsUpdatedLast)*pBwGroup->cbTransferPerSecMax/(1000*1000*1000);
-    uint32_t uTokens = RT_MIN(pBwGroup->cbBucketSize, uTokensAdded + pBwGroup->cbTokensLast);
-
-    if (cbTransfer > uTokens)
-    {
-        fAllowed = false;
-        ASMAtomicWriteBool(&pFilter->fChoked, true);
+    if (pBwGroup->cbTransferPerSecMax)
+    {
+        /* Re-fill the bucket first */
+        uint64_t tsNow = RTTimeSystemNanoTS();
+        uint32_t uTokensAdded = (tsNow - pBwGroup->tsUpdatedLast)*pBwGroup->cbTransferPerSecMax/(1000*1000*1000);
+        uint32_t uTokens = RT_MIN(pBwGroup->cbBucketSize, uTokensAdded + pBwGroup->cbTokensLast);
+
+        if (cbTransfer > uTokens)
+        {
+            fAllowed = false;
+            ASMAtomicWriteBool(&pFilter->fChoked, true);
+        }
+        else
+        {
+            pBwGroup->tsUpdatedLast = tsNow;
+            pBwGroup->cbTokensLast = uTokens - cbTransfer;
+        }
+        Log2((LOG_FN_FMT "BwGroup=%#p{%s} cbTransfer=%u uTokens=%u uTokensAdded=%u fAllowed=%RTbool\n",
+              __PRETTY_FUNCTION__, pBwGroup, pBwGroup->pszName, cbTransfer, uTokens, uTokensAdded, fAllowed));
     }
     else
-    {
-        pBwGroup->tsUpdatedLast = tsNow;
-        pBwGroup->cbTokensLast = uTokens - cbTransfer;
-    }
+        Log2((LOG_FN_FMT "BwGroup=%#p{%s} disabled fAllowed=%RTbool\n",
+              __PRETTY_FUNCTION__, pBwGroup, pBwGroup->pszName, fAllowed));
 
     rc = RTCritSectLeave(&pBwGroup->cs); AssertRC(rc);
-    Log2((LOG_FN_FMT "BwGroup=%#p{%s} cbTransfer=%u uTokens=%u uTokensAdded=%u fAllowed=%RTbool\n",
-          __PRETTY_FUNCTION__, pBwGroup, pBwGroup->pszName, cbTransfer, uTokens, uTokensAdded, fAllowed));
     return fAllowed;
 }