Changeset 44355 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Jan 24, 2013 1:27:28 PM (12 years ago)

Author:

vboxsync

Message:

PDMNetShaper: Cleanups & fixes (untested). PVM -> PUVM. Note: cs is a register within the VMM, not critical section. :)

Location:

trunk/src/VBox/VMM/include

Files:

• PDMInternal.h (modified) (1 diff)
• PDMNetShaperInternal.h (moved) (moved from trunk/include/VBox/vmm/pdmnetshaperint.h ) (3 diffs)

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -1086 +1086 @@
     R3PTRTYPE(PPDMASYNCCOMPLETIONTEMPLATE) pAsyncCompletionTemplates;
     /** @} */
+
+    /** Global block cache data. */
+    R3PTRTYPE(PPDMBLKCACHEGLOBAL)   pBlkCacheGlobal;
 #ifdef VBOX_WITH_NETSHAPER
     /** Pointer to network shaper instance. */
     R3PTRTYPE(PPDMNETSHAPER)        pNetShaper;
 #endif /* VBOX_WITH_NETSHAPER */
-
-    R3PTRTYPE(PPDMBLKCACHEGLOBAL)   pBlkCacheGlobal;
 
 } PDMUSERPERVM;

trunk/src/VBox/VMM/include/PDMNetShaperInternal.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * PDM Network Shaper - Internal data structures and functions common for both
- * R0 and R3 parts.
+ * PDM Network Shaper - Internal data structures and functions common for both R0 and R3 parts.
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -32 +31 @@
 {
     /** Pointer to the next group in the list. */
-    struct PDMNSBWGROUP                        *pNext;
+    R3PTRTYPE(struct PDMNSBWGROUP *)            pNextR3;
     /** Pointer to the shared UVM structure. */
-    struct PDMNETSHAPER                        *pShaper;
+    R3PTRTYPE(struct PDMNETSHAPER *)            pShaperR3;
     /** Critical section protecting all members below. */
-    PDMCRITSECT               cs;
+    PDMCRITSECT                                 Lock;
     /** Pointer to the first filter attached to this group. */
-    struct PDMNSFILTER                         *pFiltersHead;
+    R3PTRTYPE(struct PDMNSFILTER *)             pFiltersHeadR3;
     /** Bandwidth group name. */
-    char                                       *pszName;
+    R3PTRTYPE(char *)                           pszNameR3;
     /** Maximum number of bytes filters are allowed to transfer. */
-    volatile uint64_t                           cbTransferPerSecMax;
+    volatile uint64_t                           cbPerSecMax;
     /** Number of bytes we are allowed to transfer in one burst. */
-    volatile uint32_t                           cbBucketSize;
+    volatile uint32_t                           cbBucket;
     /** Number of bytes we were allowed to transfer at the last update. */
     volatile uint32_t                           cbTokensLast;
@@ -55 +54 @@
 typedef PDMNSBWGROUP *PPDMNSBWGROUP;
 
-DECLINLINE(bool) pdmNsAllocateBandwidth(PPDMNSFILTER pFilter, size_t cbTransfer)
-{
-    AssertPtrReturn(pFilter, true);
-    if (!VALID_PTR(pFilter->CTX_SUFF(pBwGroup)))
-        return true;
 
-    PPDMNSBWGROUP pBwGroup = ASMAtomicReadPtrT(&pFilter->CTX_SUFF(pBwGroup), PPDMNSBWGROUP);
-    int rc = PDMCritSectEnter(&pBwGroup->cs, VERR_SEM_BUSY); AssertRC(rc);
-    if (RT_UNLIKELY(rc == VERR_SEM_BUSY))
-        return true;
-    bool fAllowed = 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 - (uint32_t)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
-        Log2((LOG_FN_FMT "BwGroup=%#p{%s} disabled fAllowed=%RTbool\n",
-              __PRETTY_FUNCTION__, pBwGroup, pBwGroup->pszName, fAllowed));
-
-    rc = PDMCritSectLeave(&pBwGroup->cs); AssertRC(rc);
-    return fAllowed;
-}