Changeset 88748 in vbox for trunk/src/VBox

Timestamp:

Apr 28, 2021 2:50:26 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: Scaling down the maximum of the vm activity charts.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity

Files:

• UIVMActivityMonitor.cpp (modified) (8 diffs)
• UIVMActivityMonitor.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -632 +632 @@
     , m_fRequiresGuestAdditions(false)
     , m_fIsInitialized(false)
+    , m_fAutoUpdateMaximum(false)
 {
     RT_NOREF(iMaximumQueueSize); /* Unused according to Clang 11. */
@@ -673 +674 @@
 }
 
-void UIMetric::addData(int iDataSeriesIndex, quint64 fData)
+void UIMetric::addData(int iDataSeriesIndex, quint64 iData)
 {
     if (iDataSeriesIndex >= DATA_SERIES_SIZE)
         return;
-    m_data[iDataSeriesIndex].enqueue(fData);
+    m_data[iDataSeriesIndex].enqueue(iData);
+    if (m_fAutoUpdateMaximum)
+        m_iMaximum = qMax(m_iMaximum, iData);
+
     if (m_data[iDataSeriesIndex].size() > g_iMaximumQueueSize)
+    {
+        bool fSearchMax = false;
+        if (m_fAutoUpdateMaximum && m_data[iDataSeriesIndex].head() >= m_iMaximum)
+            fSearchMax = true;
         m_data[iDataSeriesIndex].dequeue();
+        if (fSearchMax)
+        {
+            m_iMaximum = 0;
+            foreach (quint64 iVal, m_data[iDataSeriesIndex])
+                m_iMaximum = qMax(m_iMaximum, iVal);
+        }
+    }
 }
 
@@ -764 +779 @@
     }
     stream << "\n";
+}
+
+void UIMetric::setAutoUpdateMaximum(bool fAuto)
+{
+    m_fAutoUpdateMaximum = fAuto;
+}
+
+bool UIMetric::autoUpdateMaximum() const
+{
+    return m_fAutoUpdateMaximum;
 }
 
@@ -1112 +1137 @@
     networkMetric.setDataSeriesName(0, "Receive Rate");
     networkMetric.setDataSeriesName(1, "Transmit Rate");
+    networkMetric.setAutoUpdateMaximum(true);
     m_metrics.insert(m_strNetworkMetricName, networkMetric);
 
@@ -1118 +1144 @@
     diskIOMetric.setDataSeriesName(0, "Write Rate");
     diskIOMetric.setDataSeriesName(1, "Read Rate");
+    diskIOMetric.setAutoUpdateMaximum(true);
     m_metrics.insert(m_strDiskIOMetricName, diskIOMetric);
 
     /* VM exits metric */
     UIMetric VMExitsMetric(m_strVMExitMetricName, "times", g_iMaximumQueueSize);
+    VMExitsMetric.setAutoUpdateMaximum(true);
     m_metrics.insert(m_strVMExitMetricName, VMExitsMetric);
 }
@@ -1257 +1285 @@
     NetMetric.addData(0, iReceiveRate);
     NetMetric.addData(1, iTransmitRate);
-    quint64 iMaximum = qMax(NetMetric.maximum(), qMax(iReceiveRate, iTransmitRate));
-    NetMetric.setMaximum(iMaximum);
 
     if (m_infoLabels.contains(m_strNetworkMetricName)  && m_infoLabels[m_strNetworkMetricName])
@@ -1359 +1385 @@
     }
 
-    quint64 iMaximum = qMax(diskMetric.maximum(), qMax(iWriteRate, iReadRate));
-    diskMetric.setMaximum(iMaximum);
-
     if (m_infoLabels.contains(m_strDiskIOMetricName)  && m_infoLabels[m_strDiskIOMetricName])
     {
@@ -1391 +1414 @@
     }
     VMExitMetric.addData(0, iRate);
-    quint64 iMaximum = qMax(VMExitMetric.maximum(), iRate);
-    VMExitMetric.setMaximum(iMaximum);
     if (m_infoLabels.contains(m_strVMExitMetricName)  && m_infoLabels[m_strVMExitMetricName])
     {

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.h

@@ -86 +86 @@
     void reset();
     void toFile(QTextStream &stream) const;
+
+    void setAutoUpdateMaximum(bool fAuto);
+    bool autoUpdateMaximum() const;
 
 private:
@@ -104 +107 @@
       * compute time step data from total deltas. m_isInitialised is true if the total has been set first time. */
     bool m_fIsInitialized;
+    /** Maximum is updated as a new data is added to data queue. */
+    bool m_fAutoUpdateMaximum;
 };