Changeset 44355 in vbox for trunk/include/VBox

Timestamp:

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

Author:

vboxsync

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

83319

Message:

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

File:

• trunk/include/VBox/vmm/pdmnetshaper.h (modified) (3 diffs)

trunk/include/VBox/vmm/pdmnetshaper.h

@@ -34 +34 @@
 
 
-#define PDM_NETSHAPER_MIN_BUCKET_SIZE 65536 /* bytes */
-#define PDM_NETSHAPER_MAX_LATENCY     100   /* milliseconds */
+/** @defgroup grp_pdm_net_shaper  The PDM Network Shaper API
+ * @ingroup grp_pdm
+ * @{
+ */
+
+
+#define PDM_NETSHAPER_MIN_BUCKET_SIZE UINT32_C(65536) /**< bytes */
+#define PDM_NETSHAPER_MAX_LATENCY     UINT32_C(100)   /**< milliseconds */
 
 RT_C_DECLS_BEGIN
@@ -41 +47 @@
 typedef struct PDMNSFILTER
 {
-    /** [R3] Pointer to the next group in the list. */
-    struct PDMNSFILTER              *pNext;
-    /** [R3] Pointer to the bandwidth group. */
-    struct PDMNSBWGROUP             *pBwGroupR3;
-    /** [R0] Pointer to the bandwidth group. */
-    R0PTRTYPE(struct PDMNSBWGROUP *) pBwGroupR0;
-    /** Becomes true when filter fails to obtain bandwidth. */
-    bool                             fChoked;
-    /** [R3] The driver this filter is aggregated into. */
-    PPDMINETWORKDOWN                 pIDrvNet;
+    /** Pointer to the next group in the list (ring-3). */
+    R3PTRTYPE(struct PDMNSFILTER *)     pNextR3;
+    /** Pointer to the bandwidth group (ring-3). */
+    R3PTRTYPE(struct PDMNSBWGROUP *)    pBwGroupR3;
+    /** Pointer to the bandwidth group (ring-0). */
+    R0PTRTYPE(struct PDMNSBWGROUP *)    pBwGroupR0;
+    /** Set when the filter fails to obtain bandwidth. */
+    bool                                fChoked;
+    /** Aligment padding. */
+    bool                                afPadding[HC_ARCH_BITS == 32 ? 3 : 7];
+    /** The driver this filter is aggregated into (ring-3). */
+    R3PTRTYPE(PPDMINETWORKDOWN)         pIDrvNetR3;
 } PDMNSFILTER;
-
-/** @defgroup grp_pdm_net_shaper  The PDM Network Shaper API
- * @ingroup grp_pdm
- * @{
- */
 
 /** Pointer to a PDM filter handle. */
@@ -64 +67 @@
 
 
-/**
- * Obtain bandwidth in a bandwidth group (R0 version).
- *
- * @returns VBox status code.
- * @param   pFilter         Pointer to the filter that allocates bandwidth.
- * @param   cbTransfer      Number of bytes to allocate.
- */
-VMMR0DECL(bool) PDMR0NsAllocateBandwidth(PPDMNSFILTER pFilter, size_t cbTransfer);
-
-/**
- * Obtain bandwidth in a bandwidth group.
- *
- * @returns VBox status code.
- * @param   pFilter         Pointer to the filter that allocates bandwidth.
- * @param   cbTransfer      Number of bytes to allocate.
- */
-VMMR3DECL(bool) PDMR3NsAllocateBandwidth(PPDMNSFILTER pFilter, size_t cbTransfer);
-
-/**
- * Attach network filter driver from bandwidth group.
- *
- * @returns VBox status code.
- * @param   pVM             Handle of VM.
- * @param   pDrvIns         The driver instance.
- * @param   pcszBwGroup     Name of the bandwidth group to attach to.
- * @param   pFilter         Pointer to the filter we attach.
- */
-VMMR3DECL(int) PDMR3NsAttach(PVM pVM, PPDMDRVINS pDrvIns, const char *pcszBwGroup, PPDMNSFILTER pFilter);
-
-/**
- * Detach network filter driver from bandwidth group.
- *
- * @returns VBox status code.
- * @param   pVM             Handle of VM.
- * @param   pDrvIns         The driver instance.
- * @param   pFilter         Pointer to the filter we detach.
- */
-VMMR3DECL(int) PDMR3NsDetach(PVM pVM, PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter);
-
-/**
- * Adjusts the maximum rate for the bandwidth group.
- *
- * @returns VBox status code.
- * @param   pVM                   Handle of VM.
- * @param   pcszBwGroup           Name of the bandwidth group to attach to.
- * @param   cbTransferPerSecMax   Maximum number of bytes per second to be transmitted.
- */
-VMMR3DECL(int) PDMR3NsBwGroupSetLimit(PVM pVM, const char *pcszBwGroup, uint64_t cbTransferPerSecMax);
+VMMDECL(bool)       PDMNsAllocateBandwidth(PPDMNSFILTER pFilter, size_t cbTransfer);
+VMMR3_INT_DECL(int) PDMR3NsAttach(PUVM pUVM, PPDMDRVINS pDrvIns, const char *pcszBwGroup, PPDMNSFILTER pFilter);
+VMMR3_INT_DECL(int) PDMR3NsDetach(PUVM pUVM, PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter);
+VMMR3DECL(int)      PDMR3NsBwGroupSetLimit(PUVM pUVM, const char *pszBwGroup, uint64_t cbPerSecMax);
 
 /** @} */