Changeset 43933 in vbox

Timestamp:

Nov 22, 2012 7:43:47 AM (12 years ago)

Author:

vboxsync

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

82255

Message:

Main/Metrics: Host link speed metric and the fix for base name extraction in VBoxManage (#6345)

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageMetrics.cpp (modified) (1 diff)
• Main/include/Performance.h (modified) (1 diff)
• Main/src-server/HostNetworkInterfaceImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp

@@ -104 +104 @@
 {
     char *pszRaw = aFullName.mutableRaw();
-    char *pszSlash = strrchr(pszRaw, '/');
-    if (pszSlash)
-    {
-        *pszSlash = 0;
-        aFullName.jolt();
+    /*
+     * Currently there are two metrics which base name is the same as the
+     * sub-metric name: CPU/MHz and Net/<iface>/LinkSpeed.
+     */
+    if (strcmp(pszRaw, "CPU/MHz") && !RTStrSimplePatternMatch("Net/*/LinkSpeed", pszRaw))
+    {
+        char *pszSlash = strrchr(pszRaw, '/');
+        if (pszSlash)
+        {
+            *pszSlash = 0;
+            aFullName.jolt();
+        }
     }
     return Bstr(aFullName);

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

@@ -515 +515 @@
     };
 
+    class HostNetworkSpeed : public BaseMetric
+    {
+    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() { delete mLinkSpeed; };
+
+        void init(ULONG period, ULONG length) { mPeriod = period; mLength = length; mLinkSpeed->init(length); };
+        void preCollect(CollectorHints& /* hints */, uint64_t /* iTick */) {};
+        void collect() { mLinkSpeed->put(mSpeed); };
+        const char *getUnit() { return "mbit/s"; };
+        ULONG getMinValue() { return 0; };
+        ULONG getMaxValue() { return INT32_MAX; };
+        ULONG getScale() { return 1; }
+    private:
+        ULONG mSpeed;
+        SubMetric *mLinkSpeed;
+    };
+
     class HostNetworkLoadRaw : public BaseMetric
     {

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

@@ -93 +93 @@
     pm::CollectorHAL *hal = aCollector->getHAL();
     /* Create sub metrics */
-    Utf8StrFmt strName("Net/%ls/Load", mShortName.raw());
-    pm::SubMetric *networkLoadRx   = new pm::SubMetric(strName + "/Rx",
+    Utf8StrFmt strName("Net/%ls", mShortName.raw());
+    pm::SubMetric *networkLoadRx   = new pm::SubMetric(strName + "/Load/Rx",
         "Percentage of network interface receive bandwidth used.");
-    pm::SubMetric *networkLoadTx   = new pm::SubMetric(strName + "/Tx",
+    pm::SubMetric *networkLoadTx   = new pm::SubMetric(strName + "/Load/Tx",
         "Percentage of network interface transmit bandwidth used.");
+    pm::SubMetric *networkLinkSpeed = new pm::SubMetric(strName + "/LinkSpeed",
+        "Physical link speed.");
 
     /* Create and register base metrics */
-    pm::BaseMetric *networkLoad = new pm::HostNetworkLoadRaw(hal, objptr, strName, Utf8Str(mShortName), Utf8Str(mInterfaceName), m.speedMbits, networkLoadRx, networkLoadTx);
+    pm::BaseMetric *networkSpeed = new pm::HostNetworkSpeed(hal, objptr, strName + "/LinkSpeed", Utf8Str(mShortName), Utf8Str(mInterfaceName), m.speedMbits, networkLinkSpeed);
+    aCollector->registerBaseMetric(networkSpeed);
+    pm::BaseMetric *networkLoad = new pm::HostNetworkLoadRaw(hal, objptr, strName + "/Load", Utf8Str(mShortName), Utf8Str(mInterfaceName), m.speedMbits, networkLoadRx, networkLoadTx);
     aCollector->registerBaseMetric(networkLoad);
+
+    aCollector->registerMetric(new pm::Metric(networkSpeed, networkLinkSpeed, 0));
+    aCollector->registerMetric(new pm::Metric(networkSpeed, networkLinkSpeed,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(networkSpeed, networkLinkSpeed,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(networkSpeed, networkLinkSpeed,
+                                              new pm::AggregateMax()));
 
     aCollector->registerMetric(new pm::Metric(networkLoad, networkLoadRx, 0));
@@ -124 +136 @@
     LogFlowThisFunc(("mShortName={%ls}, mInterfaceName={%ls}, mGuid={%s}\n",
                      mShortName.raw(), mInterfaceName.raw(), mGuid.toString().c_str()));
-    Utf8StrFmt name("Net/%ls/Load", mShortName.raw());
+    Utf8StrFmt name("Net/%ls", mShortName.raw());
     aCollector->unregisterMetricsFor(objptr, name + "/*");
     aCollector->unregisterBaseMetricsFor(objptr, name);