Changeset 88067 in vbox

Timestamp:

Mar 10, 2021 11:20:46 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510. More export stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/monitor/performance

Files:

• UIPerformanceMonitor.cpp (modified) (4 diffs)
• UIPerformanceMonitor.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/monitor/performance/UIPerformanceMonitor.cpp

@@ -689 +689 @@
 }
 
+void UIMetric::setDataSeriesName(int iDataSeriesIndex, const QString &strName)
+{
+    if (iDataSeriesIndex >= DATA_SERIES_SIZE)
+        return;
+    m_strDataSeriesName[iDataSeriesIndex] = strName;
+}
+
+QString UIMetric::dataSeriesName(int iDataSeriesIndex) const
+{
+    if (iDataSeriesIndex >= DATA_SERIES_SIZE)
+        return QString();
+    return m_strDataSeriesName[iDataSeriesIndex];
+}
+
 void UIMetric::setTotal(int iDataSeriesIndex, quint64 iTotal)
 {
@@ -739 +753 @@
     stream << "Unit: " << m_strUnit << "\n";
     stream << "Maximum: " << m_iMaximum << "\n";
-    foreach (const quint64& data, m_data[0])
-        stream << data << " ";
+    for (int i = 0; i < 2; ++i)
+    {
+        if (!m_data[i].isEmpty())
+        {
+            stream << "Data Series: " << m_strDataSeriesName[i] << "\n";
+            foreach (const quint64& data, m_data[i])
+                stream << data << " ";
+            stream << "\n";
+        }
+    }
     stream << "\n";
-    foreach (const quint64& data, m_data[1])
-        stream << data << " ";
-    stream << "\n\n";
 }
 
@@ -1071 +1090 @@
                 if (strName.contains("RAM", Qt::CaseInsensitive) && strName.contains("Free", Qt::CaseInsensitive))
                 {
-                    UIMetric newMetric(m_strRAMMetricName, metrics[i].GetUnit(), g_iMaximumQueueSize);
-                    newMetric.setRequiresGuestAdditions(true);
-                    m_metrics.insert(m_strRAMMetricName, newMetric);
+                    UIMetric ramMetric(m_strRAMMetricName, metrics[i].GetUnit(), g_iMaximumQueueSize);
+                    ramMetric.setDataSeriesName(0, "Free");
+                    ramMetric.setDataSeriesName(1, "Used");
+                    ramMetric.setRequiresGuestAdditions(true);
+                    m_metrics.insert(m_strRAMMetricName, ramMetric);
                 }
             }
@@ -1079 +1100 @@
     }
 
-    m_metrics.insert(m_strCPUMetricName, UIMetric(m_strCPUMetricName, "%", g_iMaximumQueueSize));
-    {
-        /* Network metric: */
-        UIMetric networkMetric(m_strNetworkMetricName, "B", g_iMaximumQueueSize);
-        m_metrics.insert(m_strNetworkMetricName, networkMetric);
-    }
+    /* CPU Metric: */
+    UIMetric cpuMetric(m_strCPUMetricName, "%", g_iMaximumQueueSize);
+    cpuMetric.setDataSeriesName(0, "Guest Load");
+    cpuMetric.setDataSeriesName(1, "VMM Load");
+    m_metrics.insert(m_strCPUMetricName, cpuMetric);
+
+    /* Network metric: */
+    UIMetric networkMetric(m_strNetworkMetricName, "B", g_iMaximumQueueSize);
+    networkMetric.setDataSeriesName(0, "Receive Rate");
+    networkMetric.setDataSeriesName(1, "Transmit Rate");
+    m_metrics.insert(m_strNetworkMetricName, networkMetric);
 
     /* Disk IO metric */
-    {
-        UIMetric diskIOMetric(m_strDiskIOMetricName, "B", g_iMaximumQueueSize);
-        m_metrics.insert(m_strDiskIOMetricName, diskIOMetric);
-    }
+    UIMetric diskIOMetric(m_strDiskIOMetricName, "B", g_iMaximumQueueSize);
+    diskIOMetric.setDataSeriesName(0, "Write Rate");
+    diskIOMetric.setDataSeriesName(1, "Read Rate");
+    m_metrics.insert(m_strDiskIOMetricName, diskIOMetric);
 
     /* VM exits metric */
-    {
-        UIMetric VMExitsMetric(m_strVMExitMetricName, "times", g_iMaximumQueueSize);
-        m_metrics.insert(m_strVMExitMetricName, VMExitsMetric);
-    }
+    UIMetric VMExitsMetric(m_strVMExitMetricName, "times", g_iMaximumQueueSize);
+    m_metrics.insert(m_strVMExitMetricName, VMExitsMetric);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/monitor/performance/UIPerformanceMonitor.h

@@ -72 +72 @@
     const QQueue<quint64> *data(int iDataSeriesIndex) const;
 
+    void setDataSeriesName(int iDataSeriesIndex, const QString &strName);
+    QString dataSeriesName(int iDataSeriesIndex) const;
+
     void setTotal(int iDataSeriesIndex, quint64 iTotal);
     quint64 total(int iDataSeriesIndex) const;
@@ -82 +85 @@
 
     void reset();
-
     void toFile(QTextStream &stream) const;
 
@@ -89 +91 @@
     QString m_strName;
     QString m_strUnit;
+    QString m_strDataSeriesName[DATA_SERIES_SIZE];
     quint64 m_iMaximum;
     QQueue<quint64> m_data[DATA_SERIES_SIZE];
@@ -206 +209 @@
     QMap<QString,QLabel*>   m_infoLabels;
 
-    /** @name These metric names are used for map keys to identify metrics.
+    /** @name These metric names are used for map keys to identify metrics. They are not translated.
       * @{ */
         QString m_strCPUMetricName;