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

Timestamp:

Feb 5, 2013 3:52:49 PM (12 years ago)

Author:

vboxsync

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

83601

Message:

Main/Metrics: Update link status on metrics setup, do not collect metrics for interfaces brought down (#6613)

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -523 +523 @@
     {
     public:
-        HostNetworkSpeed(CollectorHAL *hal, ComPtr<IUnknown> object, com::Utf8Str name, com::Utf8Str /* shortname */, com::Utf8Str /* ifname */, uint32_t speed, SubMetric *linkspeed)
-        : BaseMetric(hal, name, object), mSpeed(speed), mLinkSpeed(linkspeed) {};
+        HostNetworkSpeed(CollectorHAL *hal, ComPtr<IUnknown> object, com::Utf8Str name, com::Utf8Str shortname, com::Utf8Str /* ifname */, uint32_t speed, SubMetric *linkspeed)
+        : BaseMetric(hal, name, object), mShortName(shortname), mSpeed(speed), mLinkSpeed(linkspeed) {};
         ~HostNetworkSpeed() { delete mLinkSpeed; };
 
-        void init(ULONG period, ULONG length) { mPeriod = period; mLength = length; mLinkSpeed->init(length); };
+        void init(ULONG period, ULONG length);
+
         void preCollect(CollectorHints& /* hints */, uint64_t /* iTick */) {};
         void collect() { if (mSpeed) mLinkSpeed->put(mSpeed); };
@@ -535 +536 @@
         ULONG getScale() { return 1; }
     private:
-        ULONG mSpeed;
-        SubMetric *mLinkSpeed;
+        com::Utf8Str mShortName;
+        ULONG        mSpeed;
+        SubMetric   *mLinkSpeed;
     };
 

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

@@ -29 +29 @@
 #endif
 #include "Performance.h"
+#include "HostNetworkInterfaceImpl.h"
+#include "netif.h"
 
 #include <VBox/com/array.h>
@@ -684 +686 @@
 }
 
+#ifndef VBOX_COLLECTOR_TEST_CASE
+static bool getLinkSpeed(const char *szShortName, uint32_t *pSpeed)
+{
+    /*
+     * Note that we do not need the full name in the info, so we do not
+     * allocate the space for it and we rely on the fact that
+     * NetIfGetConfigByName() never fills it.
+     */
+    NETIFINFO Info;
+    memset(&Info, 0, sizeof(Info));
+    strcpy(Info.szShortName, szShortName);
+    int rc = NetIfGetConfigByName(&Info);
+    if (RT_FAILURE(rc))
+        return false;
+    *pSpeed =  Info.enmStatus == NETIF_S_UP ? Info.uSpeedMbits : 0;
+    return true;
+}
+
+void HostNetworkSpeed::init(ULONG period, ULONG length)
+{
+    mPeriod = period;
+    mLength = length;
+    mLinkSpeed->init(length);
+    /*
+     * Retrieve the link speed now as it may be wrong if the metric was
+     * registered at boot (see @bugref{6613}).
+     */
+    getLinkSpeed(mShortName.c_str(), &mSpeed);
+}
+
 void HostNetworkLoadRaw::init(ULONG period, ULONG length)
 {
@@ -690 +722 @@
     mRx->init(mLength);
     mTx->init(mLength);
+    /*
+     * Retrieve the link speed now as it may be wrong if the metric was
+     * registered at boot (see @bugref{6613}).
+     */
+    uint32_t uSpeedMbit = 65535;
+    if (getLinkSpeed(mShortName.c_str(), &uSpeedMbit))
+        mSpeed = (uint64_t)uSpeedMbit * (1000000/8); /* Convert to bytes/sec */
     /*int rc =*/ mHAL->getRawHostNetworkLoad(mShortName.c_str(), &mRxPrev, &mTxPrev);
     //AssertRC(rc);
@@ -736 +775 @@
                          " Will update the list of interfaces...\n", mRc,mRc));
 }
+#endif /* !VBOX_COLLECTOR_TEST_CASE */
 
 void HostDiskLoadRaw::init(ULONG period, ULONG length)