Changeset 81109 in vbox for trunk/src/VBox

Timestamp:

Oct 4, 2019 8:12:35 AM (5 years ago)

Author:

vboxsync

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

133734

Message:

FE/Qt: bugref:9510. Refactoring

Location:

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

Files:

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

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

@@ -972 +972 @@
         pChartLayout->setSpacing(0);
 
-        if (!m_subMetrics.contains(strMetricName))
+        if (!m_metrics.contains(strMetricName))
             continue;
         QLabel *pLabel = new QLabel;
@@ -979 +979 @@
         m_infoLabels.insert(strMetricName, pLabel);
 
-        UIChart *pChart = new UIChart(this, &(m_subMetrics[strMetricName]));
+        UIChart *pChart = new UIChart(this, &(m_metrics[strMetricName]));
         m_charts.insert(strMetricName, pChart);
         pChart->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
@@ -1045 +1045 @@
         }
     }
-    if (m_subMetrics.contains(m_strRAMMetricName))
+    if (m_metrics.contains(m_strRAMMetricName))
         updateRAMGraphsAndMetric(iTotalRAM, iFreeRAM);
 
     /* Update the CPU load chart with values we get from IMachineDebugger::getCPULoad(..): */
-    if (m_subMetrics.contains(m_strCPUMetricName))
+    if (m_metrics.contains(m_strCPUMetricName))
     {
         ULONG aPctExecuting;
@@ -1066 +1066 @@
 
     QVector<UIDebuggerMetricData> xmlData = getTotalCounterFromDegugger(m_strQueryString);
-    for (QMap<QString, UIMetric>::iterator iterator =  m_subMetrics.begin();
-         iterator != m_subMetrics.end(); ++iterator)
+    for (QMap<QString, UIMetric>::iterator iterator =  m_metrics.begin();
+         iterator != m_metrics.end(); ++iterator)
     {
         UIMetric &metric = iterator.value();
@@ -1135 +1135 @@
                     UIMetric newMetric(m_strRAMMetricName, metrics[i].GetUnit(), iMaximumQueueSize);
                     newMetric.setRequiresGuestAdditions(true);
-                    m_subMetrics.insert(m_strRAMMetricName, newMetric);
+                    m_metrics.insert(m_strRAMMetricName, newMetric);
                 }
             }
@@ -1141 +1141 @@
     }
 
-    m_subMetrics.insert(m_strCPUMetricName, UIMetric(m_strCPUMetricName, "%", iMaximumQueueSize));
+    m_metrics.insert(m_strCPUMetricName, UIMetric(m_strCPUMetricName, "%", iMaximumQueueSize));
     {
         /* Network metric: */
@@ -1152 +1152 @@
         networkMetricDataSubStringList << "ReceiveBytes" << "TransmitBytes";
         networkMetric.setMetricDataSubString(networkMetricDataSubStringList);
-        m_subMetrics.insert(m_strNetworkMetricName, networkMetric);
+        m_metrics.insert(m_strNetworkMetricName, networkMetric);
     }
 
@@ -1166 +1166 @@
         diskIODataSubStringList << "WrittenBytes" << "ReadBytes";
         diskIOMetric.setMetricDataSubString(diskIODataSubStringList);
-        m_subMetrics.insert(m_strDiskIOMetricName, diskIOMetric);
+        m_metrics.insert(m_strDiskIOMetricName, diskIOMetric);
     }
 
@@ -1179 +1179 @@
         subStringList << "RecordedExits";
         VMExitsMetric.setMetricDataSubString(subStringList);
-        m_subMetrics.insert(m_strVMExitMetricName, VMExitsMetric);
-    }
-
-    for (QMap<QString, UIMetric>::const_iterator iterator =  m_subMetrics.begin();
-         iterator != m_subMetrics.end(); ++iterator)
+        m_metrics.insert(m_strVMExitMetricName, VMExitsMetric);
+    }
+
+    for (QMap<QString, UIMetric>::const_iterator iterator =  m_metrics.begin();
+         iterator != m_metrics.end(); ++iterator)
     {
         if (iterator.value().queryString().isEmpty())
@@ -1213 +1213 @@
 void UIInformationPerformanceMonitor::enableDisableGuestAdditionDependedWidgets(bool fEnable)
 {
-    for (QMap<QString, UIMetric>::const_iterator iterator =  m_subMetrics.begin();
-         iterator != m_subMetrics.end(); ++iterator)
+    for (QMap<QString, UIMetric>::const_iterator iterator =  m_metrics.begin();
+         iterator != m_metrics.end(); ++iterator)
     {
         if (!iterator.value().requiresGuestAdditions())
@@ -1233 +1233 @@
 void UIInformationPerformanceMonitor::updateCPUGraphsAndMetric(ULONG iExecutingPercentage, ULONG iOtherPercentage)
 {
-    UIMetric &CPUMetric = m_subMetrics[m_strCPUMetricName];
+    UIMetric &CPUMetric = m_metrics[m_strCPUMetricName];
     CPUMetric.addData(0, iExecutingPercentage);
     CPUMetric.addData(1, iOtherPercentage);
@@ -1258 +1258 @@
 void UIInformationPerformanceMonitor::updateRAMGraphsAndMetric(quint64 iTotalRAM, quint64 iFreeRAM)
 {
-    UIMetric &RAMMetric = m_subMetrics[m_strRAMMetricName];
+    UIMetric &RAMMetric = m_metrics[m_strRAMMetricName];
     RAMMetric.setMaximum(iTotalRAM);
     RAMMetric.addData(0, iTotalRAM - iFreeRAM);
@@ -1278 +1278 @@
 void UIInformationPerformanceMonitor::updateNetworkGraphsAndMetric(quint64 iReceiveTotal, quint64 iTransmitTotal)
 {
-    UIMetric &NetMetric = m_subMetrics[m_strNetworkMetricName];
+    UIMetric &NetMetric = m_metrics[m_strNetworkMetricName];
 
     quint64 iReceiveRate = iReceiveTotal - NetMetric.total(0);
@@ -1321 +1321 @@
 void UIInformationPerformanceMonitor::updateDiskIOGraphsAndMetric(quint64 uDiskIOTotalWritten, quint64 uDiskIOTotalRead)
 {
-    UIMetric &diskMetric = m_subMetrics[m_strDiskIOMetricName];
+    UIMetric &diskMetric = m_metrics[m_strDiskIOMetricName];
 
     quint64 iWriteRate = uDiskIOTotalWritten - diskMetric.total(0);
@@ -1367 +1367 @@
         return;
 
-    UIMetric &VMExitMetric = m_subMetrics[m_strVMExitMetricName];
+    UIMetric &VMExitMetric = m_metrics[m_strVMExitMetricName];
     quint64 iRate = uTotalVMExits - VMExitMetric.total(0);
     VMExitMetric.setTotal(0, uTotalVMExits);

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

@@ -168 +168 @@
     bool guestAdditionsAvailable(int iMinimumMajorVersion);
     void enableDisableGuestAdditionDependedWidgets(bool fEnable);
-    void updateCPUGraphsAndMetric(ULONG iLoadPercentage, ULONG iOtherPercentage);
-    void updateRAMGraphsAndMetric(quint64 iTotalRAM, quint64 iFreeRAM);
-    void updateNetworkGraphsAndMetric(quint64 iReceiveTotal, quint64 iTransmitTotal);
-    void updateDiskIOGraphsAndMetric(quint64 uDiskIOTotalWritten, quint64 uDiskIOTotalRead);
-    void updateVMExitMetric(quint64 uTotalVMExits);
+
+    /** @name The following functions update corresponding metric charts and labels with new values
+      * @{ */
+        void updateCPUGraphsAndMetric(ULONG iLoadPercentage, ULONG iOtherPercentage);
+        void updateRAMGraphsAndMetric(quint64 iTotalRAM, quint64 iFreeRAM);
+        void updateNetworkGraphsAndMetric(quint64 iReceiveTotal, quint64 iTransmitTotal);
+        void updateDiskIOGraphsAndMetric(quint64 uDiskIOTotalWritten, quint64 uDiskIOTotalRead);
+        void updateVMExitMetric(quint64 uTotalVMExits);
+    /** @} */
+
     /** Returns a QColor for the chart with @p strChartName and data series with @p iDataIndex. */
     QString dataColorString(const QString &strChartName, int iDataIndex);
@@ -189 +194 @@
     QTimer *m_pTimer;
 
-    QVector<QString> m_nameList;
-    QVector<CUnknown> m_objectList;
-
-    QMap<QString, UIMetric> m_subMetrics;
+    /** @name The following are used during UIPerformanceCollector::QueryMetricsData(..)
+      * @{ */
+        QVector<QString> m_nameList;
+        QVector<CUnknown> m_objectList;
+    /** @} */
+
+    QMap<QString, UIMetric> m_metrics;
     QMap<QString,UIChart*>  m_charts;
     /** Stores the QLabel instances which we show next to each UIChart. The value is the name of the metric. */
     QMap<QString,QLabel*>   m_infoLabels;
-
 
     /** @name These metric names are used for map keys to identify metrics.