Changeset 43629 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Oct 12, 2012 9:26:07 AM (12 years ago)

Author:

vboxsync

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

81354

Message:

Main/Metrics: Linux fs/disk metrics, VBoxManage filtering + minor fixes (#6345)

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp (modified) (15 diffs)

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

@@ -34 +34 @@
 #include <VBox/log.h>
 
+#include <set>
+#include <utility>
+
 #include "VBoxManage.h"
 using namespace com;
@@ -41 +44 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-
-static bool isLastSlash(const char *str)
-{
-    char c;
-    while ((c = *str++))
-    {
-        if (c == ',')
-            break;
-        if (c == '/')
-            return false;
-    }
-
-    return true;
-}
-
-static char *toBaseMetricNames(const char *metricList)
-{
-    char *newList = (char*)RTMemAlloc(strlen(metricList) + 1);
-    if (newList)
-    {
-        int cSlashes = 0;
-        bool fSkip = false;
-        const char *src = metricList;
-        char c, *dst = newList;
-        while ((c = *src++))
-            if (c == ':')
-                fSkip = true;
-            else if (c == '/' && ++cSlashes >= 2 && isLastSlash(src))
-                fSkip = true;
-            else if (c == ',')
-            {
-                fSkip = false;
-                cSlashes = 0;
-                *dst++ = c;
-            }
-            else
-                if (!fSkip)
-                    *dst++ = c;
-        *dst = 0;
-    }
-    return newList;
-}
 
 static int parseFilterParameters(int argc, char *argv[],
                                  ComPtr<IVirtualBox> aVirtualBox,
                                  ComSafeArrayOut(BSTR, outMetrics),
-                                 ComSafeArrayOut(BSTR, outBaseMetrics),
                                  ComSafeArrayOut(IUnknown *, outObjects))
 {
     HRESULT rc = S_OK;
     com::SafeArray<BSTR> retMetrics(1);
-    com::SafeArray<BSTR> retBaseMetrics(1);
     com::SafeIfaceArray <IUnknown> retObjects;
 
@@ -99 +58 @@
     /* Metric list */
     if (argc > 1)
-    {
         metricNames = argv[1];
-        char *tmp   = toBaseMetricNames(argv[1]);
-        if (!tmp)
-            return VERR_NO_MEMORY;
-        baseNames   = tmp;
-        RTMemFree(tmp);
-    }
     else
     {
@@ -113 +65 @@
     }
     metricNames.cloneTo(&retMetrics[0]);
-    baseNames.cloneTo(&retBaseMetrics[0]);
 
     /* Object name */
@@ -145 +96 @@
 
     retMetrics.detachTo(ComSafeArrayOutArg(outMetrics));
-    retBaseMetrics.detachTo(ComSafeArrayOutArg(outBaseMetrics));
     retObjects.detachTo(ComSafeArrayOutArg(outObjects));
 
     return rc;
+}
+
+static Bstr toBaseName(Utf8Str& aFullName)
+{
+    char *pszRaw = aFullName.mutableRaw();
+    char *pszSlash = strrchr(pszRaw, '/');
+    if (pszSlash)
+    {
+        *pszSlash = 0;
+        aFullName.jolt();
+    }
+    return Bstr(aFullName);
 }
 
@@ -207 +169 @@
     HRESULT rc;
     com::SafeArray<BSTR>          metrics;
-    com::SafeArray<BSTR>          baseMetrics;
     com::SafeIfaceArray<IUnknown> objects;
 
     rc = parseFilterParameters(argc - 1, &argv[1], aVirtualBox,
                                ComSafeArrayAsOutParam(metrics),
-                               ComSafeArrayAsOutParam(baseMetrics),
                                ComSafeArrayAsOutParam(objects));
     if (FAILED(rc))
@@ -258 +218 @@
     HRESULT rc;
     com::SafeArray<BSTR>          metrics;
-    com::SafeArray<BSTR>          baseMetrics;
     com::SafeIfaceArray<IUnknown> objects;
     uint32_t period = 1, samples = 1;
@@ -293 +252 @@
     rc = parseFilterParameters(argc - i, &argv[i], aVirtualBox,
                                ComSafeArrayAsOutParam(metrics),
-                               ComSafeArrayAsOutParam(baseMetrics),
                                ComSafeArrayAsOutParam(objects));
     if (FAILED(rc))
@@ -322 +280 @@
     HRESULT rc;
     com::SafeArray<BSTR>          metrics;
-    com::SafeArray<BSTR>          baseMetrics;
     com::SafeIfaceArray<IUnknown> objects;
 
     rc = parseFilterParameters(argc - 1, &argv[1], aVirtualBox,
                                ComSafeArrayAsOutParam(metrics),
-                               ComSafeArrayAsOutParam(baseMetrics),
                                ComSafeArrayAsOutParam(objects));
     if (FAILED(rc))
@@ -430 +386 @@
     HRESULT rc;
     com::SafeArray<BSTR>          metrics;
-    com::SafeArray<BSTR>          baseMetrics;
     com::SafeIfaceArray<IUnknown> objects;
     uint32_t period = 1, samples = 1;
@@ -467 +422 @@
     rc = parseFilterParameters(argc - i, &argv[i], aVirtualBox,
                                ComSafeArrayAsOutParam(metrics),
-                               ComSafeArrayAsOutParam(baseMetrics),
                                ComSafeArrayAsOutParam(objects));
     if (FAILED(rc))
         return 1;
 
-
+    com::SafeIfaceArray<IPerformanceMetric> metricInfo;
+
+    CHECK_ERROR(performanceCollector,
+        GetMetrics(ComSafeArrayAsInParam(metrics),
+                   ComSafeArrayAsInParam(objects),
+                   ComSafeArrayAsOutParam(metricInfo)));
+
+    std::set<std::pair<ComPtr<IUnknown>,Bstr> > baseMetrics;
+    ComPtr<IUnknown> objectFiltered;
+    Bstr metricNameFiltered;
+    for (i = 0; i < (int)metricInfo.size(); i++)
+    {
+        CHECK_ERROR(metricInfo[i], COMGETTER(Object)(objectFiltered.asOutParam()));
+        CHECK_ERROR(metricInfo[i], COMGETTER(MetricName)(metricNameFiltered.asOutParam()));
+        Utf8Str baseMetricName(metricNameFiltered);
+        baseMetrics.insert(std::make_pair(objectFiltered, toBaseName(baseMetricName)));
+    }
+    com::SafeArray<BSTR>          baseMetricsFiltered(baseMetrics.size());
+    com::SafeIfaceArray<IUnknown> objectsFiltered(baseMetrics.size());
+    std::set<std::pair<ComPtr<IUnknown>,Bstr> >::iterator it;
+    i = 0;
+    for (it = baseMetrics.begin(); it != baseMetrics.end(); ++it)
+    {
+        it->first.queryInterfaceTo(&objectsFiltered[i]);
+        Bstr(it->second).detachTo(&baseMetricsFiltered[i++]);
+    }
     com::SafeIfaceArray<IPerformanceMetric> affectedMetrics;
     CHECK_ERROR(performanceCollector,
-        SetupMetrics(ComSafeArrayAsInParam(baseMetrics),
-                     ComSafeArrayAsInParam(objects), period, samples,
+        SetupMetrics(ComSafeArrayAsInParam(baseMetricsFiltered),
+                     ComSafeArrayAsInParam(objectsFiltered), period, samples,
                      ComSafeArrayAsOutParam(affectedMetrics)));
     if (FAILED(rc))
@@ -561 +540 @@
     HRESULT rc;
     com::SafeArray<BSTR>          metrics;
-    com::SafeArray<BSTR>          baseMetrics;
     com::SafeIfaceArray<IUnknown> objects;
     bool listMatches = false;
@@ -577 +555 @@
     rc = parseFilterParameters(argc - i, &argv[i], aVirtualBox,
                                ComSafeArrayAsOutParam(metrics),
-                               ComSafeArrayAsOutParam(baseMetrics),
                                ComSafeArrayAsOutParam(objects));
     if (FAILED(rc))
@@ -606 +583 @@
     HRESULT rc;
     com::SafeArray<BSTR>          metrics;
-    com::SafeArray<BSTR>          baseMetrics;
     com::SafeIfaceArray<IUnknown> objects;
     bool listMatches = false;
@@ -622 +598 @@
     rc = parseFilterParameters(argc - i, &argv[i], aVirtualBox,
                                ComSafeArrayAsOutParam(metrics),
-                               ComSafeArrayAsOutParam(baseMetrics),
                                ComSafeArrayAsOutParam(objects));
     if (FAILED(rc))