Changeset 43933 in vbox for trunk/src/VBox/Frontends

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp (modified) (1 diff)

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);