Changeset 80420 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 26, 2019 7:51:16 AM (6 years ago)

Author:

vboxsync

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

132894

Message:

FE/Qt: bugref:9510: Adding info labels for the vm exit metric

Location:

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

Files:

• UIInformationRuntime.cpp (modified) (4 diffs)
• UIInformationRuntime.h (modified) (1 diff)

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

@@ -666 +666 @@
     {
         int iTextX = m_iMarginLeft + i * iChartWidth / (float) (iXSubAxisCount + 1);
-        QString strCurentSec = QString::number(iTotalSeconds - i * iTotalSeconds / (float)(iXSubAxisCount + 1));
-        int iTextWidth = fontMetrics.width(strCurentSec);
+        QString strCurrentSec = QString::number(iTotalSeconds - i * iTotalSeconds / (float)(iXSubAxisCount + 1));
+        int iTextWidth = fontMetrics.width(strCurrentSec);
         if (i == 0)
         {
-            strCurentSec += " " + m_strXAxisLabel;
-            painter.drawText(iTextX, height() - m_iMarginBottom + iFontHeight, strCurentSec);
+            strCurrentSec += " " + m_strXAxisLabel;
+            painter.drawText(iTextX, height() - m_iMarginBottom + iFontHeight, strCurrentSec);
         }
         else
-            painter.drawText(iTextX - 0.5 * iTextWidth, height() - m_iMarginBottom + iFontHeight, strCurentSec);
+            painter.drawText(iTextX - 0.5 * iTextWidth, height() - m_iMarginBottom + iFontHeight, strCurrentSec);
     }
 }
@@ -967 +967 @@
     m_strDiskIOInfoLabelReadTotal = QApplication::translate("UIVMInformationDialog", "Total Read");
     iMaximum = qMax(iMaximum, m_strDiskIOInfoLabelReadTotal.length());
+    m_strVMExitInfoLabelTitle = QApplication::translate("UIVMInformationDialog", "VM Exits");
+    iMaximum = qMax(iMaximum, m_strVMExitInfoLabelTitle.length());
+    m_strVMExitLabelCurrent = QApplication::translate("UIVMInformationDialog", "Current");
+    iMaximum = qMax(iMaximum, m_strVMExitLabelCurrent.length());
+    m_strVMExitLabelTotal = QApplication::translate("UIVMInformationDialog", "Total");
+    iMaximum = qMax(iMaximum, m_strVMExitLabelTotal.length());
 
 
@@ -1285 +1291 @@
     {
         QString strInfo;
-        QString strReceiveColor;
         if (m_infoLabels[m_strCPUMetricName]->isEnabled())
             strInfo = QString("<b>%1</b></b><br/><font color=\"%2\">%3: %4%5</font><br/><font color=\"%6\">%7: %8%9</font>")
@@ -1428 +1433 @@
     qulonglong iMaximum = qMax(VMExitMetric.maximum(), iRate);
     VMExitMetric.setMaximum(iMaximum);
+
+    if (m_infoLabels.contains(m_strVMExitMetricName)  && m_infoLabels[m_strVMExitMetricName])
+    {
+        QString strInfo;
+        if (m_infoLabels[m_strVMExitMetricName]->isEnabled())
+            strInfo = QString("<b>%1</b></b><br/>%2: %3 %4<br/>%5: %6 %7")
+                .arg(m_strVMExitInfoLabelTitle)
+                .arg(m_strVMExitLabelCurrent).arg(QString::number(iRate)).arg(VMExitMetric.unit())
+                .arg(m_strVMExitLabelTotal).arg(QString::number(uTotalVMExits)).arg(VMExitMetric.unit());
+        else
+            strInfo = QString("<b>%1</b><br/>%2%3").arg(m_strVMExitInfoLabelTitle).arg("--").arg("%");
+        m_infoLabels[m_strVMExitMetricName]->setText(strInfo);
+    }
+    if (m_charts.contains(m_strVMExitMetricName))
+        m_charts[m_strVMExitMetricName]->update();
 }
 

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

@@ -221 +221 @@
         QString m_strDiskIOInfoLabelWrittenTotal;
         QString m_strDiskIOInfoLabelReadTotal;
+        /** VM Exit info label strings. */
+        QString m_strVMExitInfoLabelTitle;
+        QString m_strVMExitLabelCurrent;
+        QString m_strVMExitLabelTotal;
     /** @} */
     /** The following string is used while querrying CMachineDebugger. */