Changeset 43538 in vbox for trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp

Timestamp:

Oct 4, 2012 12:24:20 PM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Host network interface metrics for Solaris (#6345)

File:

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

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

@@ -89 +89 @@
 void HostNetworkInterface::registerMetrics(PerformanceCollector *aCollector, ComPtr<IUnknown> objptr)
 {
-    LogFlowThisFunc(("mInterfaceName={%ls}, mGuid={%s}\n",
-                      mInterfaceName.raw(), mGuid.toString().c_str()));
+    LogFlowThisFunc(("mShortName={%ls}, mInterfaceName={%ls}, mGuid={%s}, mSpeedMbits=%u\n",
+                     mShortName.raw(), mInterfaceName.raw(), mGuid.toString().c_str(), m.speedMbits));
     pm::CollectorHAL *hal = aCollector->getHAL();
     /* Create sub metrics */
-    Utf8StrFmt strName("Net/%ls/Load", mInterfaceName.raw());
+    Utf8StrFmt strName("Net/%ls/Load", mShortName.raw());
     pm::SubMetric *networkLoadRx   = new pm::SubMetric(strName + "/Rx",
         "Percentage of network interface bandwidth used.");
@@ -100 +100 @@
 
     /* Create and register base metrics */
-    pm::BaseMetric *networkLoad = new pm::HostNetworkLoadRaw(hal, objptr, strName, Utf8Str(mInterfaceName), m.speedMbytes, networkLoadRx, networkLoadTx);
+    pm::BaseMetric *networkLoad = new pm::HostNetworkLoadRaw(hal, objptr, strName, Utf8Str(mShortName), m.speedMbits, networkLoadRx, networkLoadTx);
     aCollector->registerBaseMetric(networkLoad);
 
@@ -122 +122 @@
 void HostNetworkInterface::unregisterMetrics(PerformanceCollector *aCollector, ComPtr<IUnknown> objptr)
 {
-    LogFlowThisFunc(("mInterfaceName={%ls}, mGuid={%s}\n",
-                      mInterfaceName.raw(), mGuid.toString().c_str()));
-    Utf8StrFmt name("Net/%ls/Load", mInterfaceName.raw());
+    LogFlowThisFunc(("mShortName={%ls}, mInterfaceName={%ls}, mGuid={%s}\n",
+                     mShortName.raw(), mInterfaceName.raw(), mGuid.toString().c_str()));
+    Utf8StrFmt name("Net/%ls/Load", mShortName.raw());
     aCollector->unregisterMetricsFor(objptr, name + "/*");
     aCollector->unregisterBaseMetricsFor(objptr, name);
@@ -150 +150 @@
         m.status = info.enmStatus;
 #endif /* !RT_OS_WINDOWS */
-        m.speedMbytes = info.uSpeedMbytes;
+        m.speedMbits = info.uSpeedMbits;
         return S_OK;
     }
@@ -183 +183 @@
     unconst(mGuid) = pIf->Uuid;
     if (pIf->szShortName[0])
+    {
         unconst(mNetworkName) = composeNetworkName(pIf->szShortName);
+        unconst(mShortName)   = pIf->szShortName;
+    }
     else
+    {
         unconst(mNetworkName) = composeNetworkName(aInterfaceName);
+        unconst(mShortName)   = aInterfaceName;
+    }
     mIfType = ifType;
 
@@ -201 +207 @@
     m.status = pIf->enmStatus;
 #endif /* !RT_OS_WINDOWS */
-    m.speedMbytes = pIf->uSpeedMbytes;
+    m.speedMbits = pIf->uSpeedMbits;
 
     /* Confirm a successful initialization */