Changeset 43456 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 28, 2012 6:36:09 AM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Missing interface detection (#6345)

Location:

trunk/src/VBox/Main

Files:

• include/Performance.h (modified) (2 diffs)
• src-server/Performance.cpp (modified) (4 diffs)
• src-server/PerformanceImpl.cpp (modified) (2 diffs)

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

@@ -497 +497 @@
     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) {};
+            : BaseMetric(hal, name, object), mInterfaceName(ifname), mRx(rx), mTx(tx), mRxPrev(0), mTxPrev(0), mRc(VINF_SUCCESS) {};
         ~HostNetworkLoadRaw() { delete mRx; delete mTx; };
 
@@ -515 +515 @@
         uint64_t      mRxPrev;
         uint64_t      mTxPrev;
+        int           mRc;
     };
 

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

@@ -663 +663 @@
 void HostNetworkLoadRaw::preCollect(CollectorHints& /* hints */, uint64_t /* iTick */)
 {
+    if (RT_FAILURE(mRc))
+    {
+        ComPtr<IHostNetworkInterface> networkInterface;
+        ComPtr<IHost> host = getObject();
+        HRESULT hrc = host->FindHostNetworkInterfaceByName(com::Bstr(mInterfaceName).raw(), networkInterface.asOutParam());
+        if (SUCCEEDED(hrc))
+        {
+            LogRel(("Failed to collect network metrics for %s: %Rrc (%d).", mInterfaceName.c_str(), mRc, mRc));
+            mRc = VINF_SUCCESS;
+        }
+    }
 }
 
@@ -669 +680 @@
     uint64_t rx, tx, speed;
 
-    int rc = mHAL->getRawHostNetworkLoad(mInterfaceName.c_str(), &rx, &tx, &speed);
-    if (RT_SUCCESS(rc))
+    mRc = mHAL->getRawHostNetworkLoad(mInterfaceName.c_str(), &rx, &tx, &speed);
+    if (RT_SUCCESS(mRc))
     {
         uint64_t rxDiff = rx - mRxPrev;
@@ -691 +702 @@
         mTxPrev = tx;
     }
+    else
+        LogFlowThisFunc(("Failed to collect data: %Rrc (%d)."
+                         " Will update the list of interfaces...\n", mRc,mRc));
 }
 
@@ -1279 +1293 @@
             if (patternMatch((*it).second.c_str(), name.c_str()))
             {
-                LogFlowThisFunc(("...found!\n"));
+                //LogFlowThisFunc(("...found!\n"));
                 return true;
             }

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

@@ -616 +616 @@
             ++n;
         }
-    LogAleksey(("{%p} " LOG_FN_FMT ": obj=%p, marked %d metrics\n",
-                this, __PRETTY_FUNCTION__, (void *)aObject, n));
+    LogAleksey(("{%p} " LOG_FN_FMT ": obj=%p, name=%s, marked %d metrics\n",
+                this, __PRETTY_FUNCTION__, (void *)aObject, name.c_str(), n));
     //LogFlowThisFuncLeave();
 }
@@ -630 +630 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    LogAleksey(("{%p} " LOG_FN_FMT ": obj=%p\n", this, __PRETTY_FUNCTION__, (void *)aObject));
+    LogAleksey(("{%p} " LOG_FN_FMT ": obj=%p, name=%s\n", this,
+                __PRETTY_FUNCTION__, (void *)aObject, name.c_str()));
     MetricList::iterator it;
     for (it = m.metrics.begin(); it != m.metrics.end();)