Changeset 43507 in vbox for trunk/src/VBox/Main/include

Timestamp:

Oct 2, 2012 1:22:31 PM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Alternative way to get link speed for old kernels (#6345)

Location:

trunk/src/VBox/Main/include

Files:

• HostNetworkInterfaceImpl.h (modified) (1 diff)
• Performance.h (modified) (3 diffs)
• netif.h (modified) (2 diffs)

trunk/src/VBox/Main/include/HostNetworkInterfaceImpl.h

@@ -110 +110 @@
         HostNetworkInterfaceMediumType_T mediumType;
         HostNetworkInterfaceStatus_T status;
+        ULONG speedMbytes;
     } m;
 

trunk/src/VBox/Main/include/Performance.h

@@ -361 +361 @@
         /** Returns CPU usage counters in platform-specific units. */
         virtual int getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle);
-        /** Returns received and transmitted bytes as well as link speed. */
-        virtual int getRawHostNetworkLoad(const char *name, uint64_t *rx, uint64_t *tx, uint64_t *speed);
+        /** Returns received and transmitted bytes. */
+        virtual int getRawHostNetworkLoad(const char *name, uint64_t *rx, uint64_t *tx);
         /** Returns process' CPU usage counter in platform-specific units. */
         virtual int getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uint64_t *kernel, uint64_t *total);
@@ -496 +496 @@
     {
     public:
-        HostNetworkLoadRaw(CollectorHAL *hal, ComPtr<IUnknown> object, com::Utf8Str name, com::Utf8Str ifname, SubMetric *rx, SubMetric *tx)
-            : BaseMetric(hal, name, object), mInterfaceName(ifname), mRx(rx), mTx(tx), mRxPrev(0), mTxPrev(0), mRc(VINF_SUCCESS) {};
+        HostNetworkLoadRaw(CollectorHAL *hal, ComPtr<IUnknown> object, com::Utf8Str name, com::Utf8Str ifname, uint32_t speed, SubMetric *rx, SubMetric *tx)
+            : BaseMetric(hal, name, object), mInterfaceName(ifname), mRx(rx), mTx(tx), mRxPrev(0), mTxPrev(0), mRc(VINF_SUCCESS) { mSpeed = (uint64_t)speed * (1000000/8); /* Convert to bytes/sec */ };
         ~HostNetworkLoadRaw() { delete mRx; delete mTx; };
 
@@ -515 +515 @@
         uint64_t      mRxPrev;
         uint64_t      mTxPrev;
+        uint64_t      mSpeed;
         int           mRc;
     };

trunk/src/VBox/Main/include/netif.h

@@ -72 +72 @@
     NETIFTYPE      enmMediumType;
     NETIFSTATUS    enmStatus;
+    uint32_t       uSpeedMbytes;
     RTUUID         Uuid;
     char           szShortName[VBOXNET_MAX_SHORT_NAME];
@@ -92 +93 @@
 int NetIfGetConfigByName(PNETIFINFO pInfo);
 int NetIfDhcpRediscover(VirtualBox *pVbox, HostNetworkInterface * pIf);
+int NetIfAdpCtlOut(const char * pcszName, const char * pcszCmd, char *pszBuffer, size_t cBufSize);
 
 DECLINLINE(Bstr) composeIPv6Address(PRTNETADDRIPV6 aAddrPtr)