Changeset 43507 in vbox for trunk/src/VBox/Main/src-server/Performance.cpp

Timestamp:

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

Author:

vboxsync

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

81089

Message:

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

File:

• trunk/src/VBox/Main/src-server/Performance.cpp (modified) (6 diffs)

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

@@ -59 +59 @@
 }
 
-int CollectorHAL::getRawHostNetworkLoad(const char * /* name */, uint64_t * /* rx */, uint64_t * /* tx */, uint64_t */* speed */)
+int CollectorHAL::getRawHostNetworkLoad(const char * /* name */, uint64_t * /* rx */, uint64_t * /* tx */)
 {
     return E_NOTIMPL;
@@ -656 +656 @@
     mRx->init(mLength);
     mTx->init(mLength);
-    uint64_t speed;
-    int rc = mHAL->getRawHostNetworkLoad(mInterfaceName.c_str(), &mRxPrev, &mTxPrev, &speed);
+    int rc = mHAL->getRawHostNetworkLoad(mInterfaceName.c_str(), &mRxPrev, &mTxPrev);
     AssertRC(rc);
 }
@@ -670 +669 @@
         if (SUCCEEDED(hrc))
         {
-            LogRel(("Failed to collect network metrics for %s: %Rrc (%d).", mInterfaceName.c_str(), mRc, mRc));
+            LogRel(("Failed to collect network metrics for %s: %Rrc (%d).\n", mInterfaceName.c_str(), mRc, mRc));
             mRc = VINF_SUCCESS;
         }
@@ -678 +677 @@
 void HostNetworkLoadRaw::collect()
 {
-    uint64_t rx, tx, speed;
-
-    mRc = mHAL->getRawHostNetworkLoad(mInterfaceName.c_str(), &rx, &tx, &speed);
+    uint64_t rx, tx;
+
+    mRc = mHAL->getRawHostNetworkLoad(mInterfaceName.c_str(), &rx, &tx);
     if (RT_SUCCESS(mRc))
     {
@@ -686 +685 @@
         uint64_t txDiff = tx - mTxPrev;
 
-        if (RT_UNLIKELY(speed * getPeriod() == 0))
-        {
-            Assert(speed * getPeriod());
-            LogFlowThisFunc(("Impossible! speed=%llu period=%d.\n", speed, getPeriod()));
+        if (RT_UNLIKELY(mSpeed * getPeriod() == 0))
+        {
+            Assert(mSpeed * getPeriod());
+            LogFlowThisFunc(("Impossible! speed=%llu period=%d.\n", mSpeed, getPeriod()));
             mRx->put(0);
             mTx->put(0);
@@ -695 +694 @@
         else
         {
-            mRx->put((ULONG)(PM_NETWORK_LOAD_MULTIPLIER * rxDiff / (speed * getPeriod())));
-            mTx->put((ULONG)(PM_NETWORK_LOAD_MULTIPLIER * txDiff / (speed * getPeriod())));
+            mRx->put((ULONG)(PM_NETWORK_LOAD_MULTIPLIER * rxDiff / (mSpeed * getPeriod())));
+            mTx->put((ULONG)(PM_NETWORK_LOAD_MULTIPLIER * txDiff / (mSpeed * getPeriod())));
         }