Changeset 40652 in vbox for trunk/include

Timestamp:

Mar 26, 2012 4:36:16 PM (13 years ago)

Author:

vboxsync

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

77084

Message:

NetShaper,E1000: Basic framework and partial implementation for network shaper

Location:

trunk/include/VBox

Files:

• log.h (modified) (2 diffs)
• vmm/mm.h (modified) (1 diff)
• vmm/pdmdrv.h (modified) (3 diffs)
• vmm/pdmnetshaper.h (added)

trunk/include/VBox/log.h

@@ -260 +260 @@
     /** The common network service group */
     LOG_GROUP_NET_SERVICE,
+    /** Network traffic shaper driver group. */
+    LOG_GROUP_NET_SHAPER,
     /** PATM group. */
     LOG_GROUP_PATM,
@@ -491 +493 @@
     "NET_FLT_DRV",  \
     "NET_SERVICE",  \
+    "NET_SHAPER",   \
     "PATM",         \
     "PDM",          \

trunk/include/VBox/vmm/mm.h

@@ -101 +101 @@
     MM_TAG_PDM_USB_USER,
     MM_TAG_PDM_LUN,
+#ifdef VBOX_WITH_NETSHAPER
+    MM_TAG_PDM_NET_SHAPER,
+#endif /* VBOX_WITH_NETSHAPER */
     MM_TAG_PDM_QUEUE,
     MM_TAG_PDM_THREAD,

trunk/include/VBox/vmm/pdmdrv.h

@@ -34 +34 @@
 #include <VBox/vmm/pdmcommon.h>
 #include <VBox/vmm/pdmasynccompletion.h>
+#ifdef VBOX_WITH_NETSHAPER
+#include <VBox/vmm/pdmnetshaper.h>
+#endif /* VBOX_WITH_NETSHAPER */
 #include <VBox/vmm/pdmblkcache.h>
 #include <VBox/vmm/tm.h>
@@ -1165 +1168 @@
                                                                 const char *pszDesc));
 
+#ifdef VBOX_WITH_NETSHAPER
+    /**
+     * Attaches network filter driver to a bandwidth group.
+     *
+     * @returns VBox status code.
+     * @param   pDrvIns         The driver instance.
+     * @param   pcszBwGroup     Name of the bandwidth group to attach to.
+     * @param   pFilter         Pointer to the filter we attach.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnNetShaperAttach,(PPDMDRVINS pDrvIns, const char *pszBwGroup,
+                                                  PPDMNSFILTER pFilter));
+
+
+    /**
+     * Detaches network filter driver to a bandwidth group.
+     *
+     * @returns VBox status code.
+     * @param   pDrvIns         The driver instance.
+     * @param   pFilter         Pointer to the filter we attach.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnNetShaperDetach,(PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter));
+#endif /* VBOX_WITH_NETSHAPER */
+
 
     /**
@@ -1704 +1730 @@
 # endif
 
+# ifdef VBOX_WITH_NETSHAPER
+/**
+ * @copydoc PDMDRVHLP::pfnNetShaperAttach
+ */
+DECLINLINE(int) PDMDrvHlpNetShaperAttach(PPDMDRVINS pDrvIns, const char *pcszBwGroup, PPDMNSFILTER pFilter)
+{
+    return pDrvIns->pHlpR3->pfnNetShaperAttach(pDrvIns, pcszBwGroup, pFilter);
+}
+
+/**
+ * @copydoc PDMDRVHLP::pfnNetShaperDetach
+ */
+DECLINLINE(int) PDMDrvHlpNetShaperDetach(PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter)
+{
+    return pDrvIns->pHlpR3->pfnNetShaperDetach(pDrvIns, pFilter);
+}
+# endif
+
 /**
  * @copydoc PDMDRVHLP::pfnCritSectInit