Changeset 107408 in vbox

Timestamp:

Dec 30, 2024 4:41:28 PM (4 months ago)

Author:

vboxsync

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

166458

Message:

FE/Qt: bugref:9510. Make sure CPU percentage is capped at 100.

Location:

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

Files:

• UIVMActivityMonitor.cpp (modified) (2 diffs)
• UIVMActivityMonitor.h (modified) (1 diff)

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

@@ -1674 +1674 @@
 }
 
-void UIVMActivityMonitorLocal::updateCPUChart(quint64 iExecutingPercentage, ULONG iOtherPercentage)
-{
+void UIVMActivityMonitorLocal::updateCPUChart(ULONG iExecutingPercentage, ULONG iOtherPercentage)
+{
+    ULONG uMax = 100;
+    ULONG uEx = qMin(iExecutingPercentage, uMax);
+    ULONG uOther = qMin(iOtherPercentage, uMax);
+    if (uEx + uOther > uMax)
+        uOther = uMax - uEx;
+
     UIMetric &CPUMetric = m_metrics[Metric_Type_CPU];
-    CPUMetric.addData(0, iExecutingPercentage);
-    CPUMetric.addData(1, iOtherPercentage);
-    CPUMetric.setMaximum(100);
+    CPUMetric.addData(0, uEx);
+    CPUMetric.addData(1, uOther);
+    CPUMetric.setMaximum(uMax);
     if (m_infoLabels.contains(Metric_Type_CPU)  && m_infoLabels[Metric_Type_CPU])
     {
@@ -1687 +1693 @@
             .arg(m_strCPUInfoLabelTitle)
             .arg(dataColorString(Metric_Type_CPU, 0))
-            .arg(m_strCPUInfoLabelGuest).arg(QString::number(iExecutingPercentage)).arg(CPUMetric.unit())
+            .arg(m_strCPUInfoLabelGuest).arg(QString::number(uEx)).arg(CPUMetric.unit())
             .arg(dataColorString(Metric_Type_CPU, 1))
-            .arg(m_strCPUInfoLabelVMM).arg(QString::number(iOtherPercentage)).arg(CPUMetric.unit());
+            .arg(m_strCPUInfoLabelVMM).arg(QString::number(uOther)).arg(CPUMetric.unit());
         m_infoLabels[Metric_Type_CPU]->setText(strInfo);
     }

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

@@ -282 +282 @@
     bool guestAdditionsAvailable(const char *pszMinimumVersion);
     void enableDisableGuestAdditionDependedWidgets(bool fEnable);
-    void updateCPUChart(quint64 iLoadPercentage, ULONG iOtherPercentage);
+    void updateCPUChart(ULONG iLoadPercentage, ULONG iOtherPercentage);
     void updateRAMGraphsAndMetric(quint64 iTotalRAM, quint64 iFreeRAM);
     void updateNetworkChart(quint64 uReceiveTotal, quint64 uTransmitTotal);