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

Timestamp:

Nov 23, 2019 5:58:45 PM (5 years ago)

Author:

vboxsync

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

134941

Message:

FE/Qt: Statistics have moved again. Optimized statistics querying by doing exact queries for each graphs rather than combining them, the difference is tree lookup vs full tree enumeration. Also fixed the borked UIDebuggerMetricData.m_strName initialization, it would get the raw xml string rather than just the value of the 'name' attribute (QStringRef). bugref:9510

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information

Files:

• UIInformationPerformanceMonitor.cpp (modified) (7 diffs)
• UIInformationPerformanceMonitor.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationPerformanceMonitor.cpp

@@ -838 +838 @@
         foreach (const QString &strSubString, m_metricDataSubString)
         {
+            /** @todo r=bird: It is much more efficient to (1) start a query with '/' and
+             *        (2) not use multiple expressions.  If you don't start with '/',
+             *        STAM must search all the statistics.  If you have multiple
+             *        expressions it is not yet clever enough to optimize the search and
+             *        will search all the statistics.  There are several thousand in a
+             *        debug builds, some 400-600 in a typical release build (config dep). */
             m_strQueryString += QString("*%1*%2*%3*|").arg(m_strQueryPrefix).arg(strDeviceName).arg(strSubString);
         }
@@ -1063 +1069 @@
     }
 
-    /* Collect the data from IMachineDebugger::getStats(..): */
-    quint64 uNetworkTotalReceive = 0;
-    quint64 uNetworkTotalTransmit = 0;
-    quint64 uDiskIOTotalWritten = 0;
-    quint64 uDiskIOTotalRead = 0;
-    quint64 uTotalVMExits = 0;
-
-    QVector<UIDebuggerMetricData> xmlData = getTotalCounterFromDegugger(m_strQueryString);
-    for (QMap<QString, UIMetric>::iterator iterator =  m_metrics.begin();
-         iterator != m_metrics.end(); ++iterator)
-    {
-        UIMetric &metric = iterator.value();
-        const QStringList &deviceTypeList = metric.deviceTypeList();
-        foreach (const QString &strDeviceType, deviceTypeList)
+    /* Update the network load chart with values we find under /Public/NetAdapter/: */
+    {
+        quint64 cbNetworkTotalReceived = 0;
+        quint64 cbNetworkTotalTransmitted = 0;
+        QVector<UIDebuggerMetricData> xmlData = getAndParseStatsFromDebugger("/Public/NetAdapter/*/Bytes*");
+        foreach (const UIDebuggerMetricData &data, xmlData)
         {
-            foreach (const UIDebuggerMetricData &data, xmlData)
-            {
-                if (data.m_strName.contains(strDeviceType, Qt::CaseInsensitive))
-                {
-                    if (metric.name() == m_strNetworkMetricName)
-                    {
-                        if (data.m_strName.contains("receive", Qt::CaseInsensitive))
-                            uNetworkTotalReceive += data.m_counter;
-                        else if (data.m_strName.contains("transmit", Qt::CaseInsensitive))
-                            uNetworkTotalTransmit += data.m_counter;
-                    }
-                    else if (metric.name() == m_strDiskIOMetricName)
-                    {
-                        if (data.m_strName.contains("written", Qt::CaseInsensitive))
-                            uDiskIOTotalWritten += data.m_counter;
-                        else if (data.m_strName.contains("read", Qt::CaseInsensitive))
-                            uDiskIOTotalRead += data.m_counter;
-                    }
-                    else if (metric.name() == m_strVMExitMetricName)
-                    {
-                        if (data.m_strName.contains("RecordedExits", Qt::CaseInsensitive))
-                            uTotalVMExits += data.m_counter;
-                    }
-                }
-            }
+            if (data.m_strName.endsWith("BytesReceived"))
+                cbNetworkTotalReceived += data.m_counter;
+            else if (data.m_strName.endsWith("BytesTransmitted"))
+                cbNetworkTotalTransmitted += data.m_counter;
+            else
+                AssertMsgFailed(("name=%s\n", data.m_strName.toLocal8Bit().data()));
         }
-    }
-    updateNetworkGraphsAndMetric(uNetworkTotalReceive, uNetworkTotalTransmit);
-    updateDiskIOGraphsAndMetric(uDiskIOTotalWritten, uDiskIOTotalRead);
-    updateVMExitMetric(uTotalVMExits);
-}
-
+        updateNetworkGraphsAndMetric(cbNetworkTotalReceived, cbNetworkTotalTransmitted);
+    }
+
+    /* Update the Disk I/O chart with values we find under /Public/Storage/?/Port?/Bytes*: */
+    {
+        quint64 cbDiskIOTotalWritten = 0;
+        quint64 cbDiskIOTotalRead = 0;
+        QVector<UIDebuggerMetricData> xmlData = getAndParseStatsFromDebugger("/Public/Storage/*/Port*/Bytes*");
+        foreach (const UIDebuggerMetricData &data, xmlData)
+        {
+            if (data.m_strName.endsWith("BytesWritten"))
+                cbDiskIOTotalWritten += data.m_counter;
+            else if (data.m_strName.endsWith("BytesRead"))
+                cbDiskIOTotalRead += data.m_counter;
+            else
+                AssertMsgFailed(("name=%s\n", data.m_strName.toLocal8Bit().data()));
+        }
+        updateDiskIOGraphsAndMetric(cbDiskIOTotalWritten, cbDiskIOTotalRead);
+    }
+
+    /* Update the VM exit chart with values we find as /PROF/CPU?/EM/RecordedExits: */
+    {
+        quint64 cTotalVMExits = 0;
+        QVector<UIDebuggerMetricData> xmlData = getAndParseStatsFromDebugger("/PROF/CPU*/EM/RecordedExits");
+        foreach (const UIDebuggerMetricData &data, xmlData)
+        {
+            if (data.m_strName.endsWith("RecordedExits"))
+                cTotalVMExits += data.m_counter;
+            else
+                AssertMsgFailed(("name=%s\n", data.m_strName.toLocal8Bit().data()));
+        }
+        updateVMExitMetric(cTotalVMExits);
+    }
+}
+
+/**
+ *
+ * @returns
+ */
 void UIInformationPerformanceMonitor::sltGuestAdditionsStateChange()
 {
@@ -1147 +1159 @@
 
     m_metrics.insert(m_strCPUMetricName, UIMetric(m_strCPUMetricName, "%", iMaximumQueueSize));
+/** @todo r=bird: This way of constructing queries is inefficient, see
+ *        comment in query composer.  Also, both the network and disk bits
+ *        have moved now.  The update timer method has been updated and no
+ *        longer makes use of this for the statistics querying. */
     {
         /* Network metric: */
@@ -1152 +1168 @@
         networkMetric.setQueryPrefix("Public");
         QStringList networkDeviceList;
-        networkDeviceList << "E1k" <<"VNet" << "PCNet";
+        networkDeviceList << "E1k" << "VNet" << "PCNet";
         networkMetric.setDeviceTypeList(networkDeviceList);
         QStringList networkMetricDataSubStringList;
@@ -1410 +1426 @@
 }
 
-QVector<UIDebuggerMetricData> UIInformationPerformanceMonitor::getTotalCounterFromDegugger(const QString &strQuery)
+QVector<UIDebuggerMetricData> UIInformationPerformanceMonitor::getAndParseStatsFromDebugger(const QString &strQuery)
 {
     QVector<UIDebuggerMetricData> xmlData;
     if (strQuery.isEmpty())
         return xmlData;
-    CMachineDebugger debugger = m_console.GetDebugger();
-    QString strStats = debugger.GetStats(strQuery, false);
+    QString strStats = m_machineDebugger.GetStats(strQuery, false);
     QXmlStreamReader xmlReader;
     xmlReader.addData(strStats);
-    quint64 iTotal = 0;
     if (xmlReader.readNextStartElement())
     {
@@ -1428 +1442 @@
                 QXmlStreamAttributes attributes = xmlReader.attributes();
                 quint64 iCounter = attributes.value("c").toULongLong();
-                iTotal += iCounter;
-                xmlReader.skipCurrentElement();
-                xmlData.push_back(UIDebuggerMetricData(*(attributes.value("name").string()), iCounter));
+                xmlData.push_back(UIDebuggerMetricData(attributes.value("name"), iCounter));
             }
             else if (xmlReader.name() == "U64")
@@ -1436 +1448 @@
                 QXmlStreamAttributes attributes = xmlReader.attributes();
                 quint64 iCounter = attributes.value("val").toULongLong();
-                iTotal += iCounter;
-                xmlReader.skipCurrentElement();
-                xmlData.push_back(UIDebuggerMetricData(*(attributes.value("name").string()), iCounter));
+                xmlData.push_back(UIDebuggerMetricData(attributes.value("name"), iCounter));
             }
-            else
-                xmlReader.skipCurrentElement();
+            xmlReader.skipCurrentElement();
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationPerformanceMonitor.h

@@ -53 +53 @@
     UIDebuggerMetricData()
         : m_counter(0){}
-    UIDebuggerMetricData(const QString & strName, quint64 counter)
-        :m_strName(strName)
+    UIDebuggerMetricData(const QStringRef & strName, quint64 counter)
+        : m_strName(strName.toString())
         , m_counter(counter){}
     QString m_strName;
@@ -181 +181 @@
     QString dataColorString(const QString &strChartName, int iDataIndex);
     /** Parses the xml string we get from the IMachineDebugger and returns an array of UIDebuggerMetricData. */
-    QVector<UIDebuggerMetricData> getTotalCounterFromDegugger(const QString &strQuery);
+    QVector<UIDebuggerMetricData> getAndParseStatsFromDebugger(const QString &strQuery);
 
     bool m_fGuestAdditionsAvailable;