Changeset 81097 in vbox

Timestamp:

Oct 2, 2019 12:45:04 PM (5 years ago)

Author:

vboxsync

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

133708

Message:

FE/Qt: bugref:9510. Some corrections

Location:

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

Files:

• UIInformationPerformanceMonitor.cpp (modified) (8 diffs)
• UIInformationPerformanceMonitor.h (modified) (8 diffs)
• UIInformationRuntime.cpp (modified) (3 diffs)
• UIInformationRuntime.h (modified) (3 diffs)

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

@@ -18 +18 @@
 /* Qt includes: */
 #include <QApplication>
-#include <QHeaderView>
 #include <QLabel>
 #include <QMenu>
@@ -26 +25 @@
 #include <QStyle>
 #include <QXmlStreamReader>
-#include <QVBoxLayout>
-#include <QTableWidget>
 #include <QTimer>
 
 /* GUI includes: */
 #include "UICommon.h"
-#include "UIConverter.h"
-#include "UIExtraDataManager.h"
-#include "UIIconPool.h"
 #include "UIInformationPerformanceMonitor.h"
 #include "UISession.h"
@@ -42 +36 @@
 #include "CPerformanceCollector.h"
 #include "CPerformanceMetric.h"
-#include "CVRDEServerInfo.h"
 
 /* External includes: */
@@ -1072 +1065 @@
     quint64 uTotalVMExits = 0;
 
-    QVector<DebuggerMetricData> xmlData = getTotalCounterFromDegugger(m_strQueryString);
+    QVector<UIDebuggerMetricData> xmlData = getTotalCounterFromDegugger(m_strQueryString);
     for (QMap<QString, UIMetric>::iterator iterator =  m_subMetrics.begin();
          iterator != m_subMetrics.end(); ++iterator)
@@ -1080 +1073 @@
         foreach (const QString &strDeviceType, deviceTypeList)
         {
-            foreach (const DebuggerMetricData &data, xmlData)
+            foreach (const UIDebuggerMetricData &data, xmlData)
             {
                 if (data.m_strName.contains(strDeviceType, Qt::CaseInsensitive))
@@ -1412 +1405 @@
 }
 
-QVector<DebuggerMetricData> UIInformationPerformanceMonitor::getTotalCounterFromDegugger(const QString &strQuery)
-{
-    QVector<DebuggerMetricData> xmlData;
+QVector<UIDebuggerMetricData> UIInformationPerformanceMonitor::getTotalCounterFromDegugger(const QString &strQuery)
+{
+    QVector<UIDebuggerMetricData> xmlData;
     if (strQuery.isEmpty())
         return xmlData;
@@ -1432 +1425 @@
                 iTotal += iCounter;
                 xmlReader.skipCurrentElement();
-                xmlData.push_back(DebuggerMetricData(*(attributes.value("name").string()), iCounter));
+                xmlData.push_back(UIDebuggerMetricData(*(attributes.value("name").string()), iCounter));
             }
             else if (xmlReader.name() == "U64")
@@ -1440 +1433 @@
                 iTotal += iCounter;
                 xmlReader.skipCurrentElement();
-                xmlData.push_back(DebuggerMetricData(*(attributes.value("name").string()), iCounter));
+                xmlData.push_back(UIDebuggerMetricData(*(attributes.value("name").string()), iCounter));
             }
             else

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

@@ -27 +27 @@
 #include <QQueue>
 
-
 /* COM includes: */
 #include "COMEnums.h"
@@ -38 +37 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
-#include "UIMainEventListener.h"
-
 
 /* Forward declarations: */
@@ -51 +48 @@
 #define DATA_SERIES_SIZE 2
 
-struct DebuggerMetricData
+/** UIDebuggerMetricData is used as data storage while parsing the xml stream received from IMachineDebugger. */
+struct UIDebuggerMetricData
 {
-    DebuggerMetricData()
+    UIDebuggerMetricData()
         : m_counter(0){}
-    DebuggerMetricData(const QString & strName, quint64 counter)
+    UIDebuggerMetricData(const QString & strName, quint64 counter)
         :m_strName(strName)
         , m_counter(counter){}
@@ -62 +60 @@
 };
 
+/** UIMetric represents a performance metric and is used to store data related to the corresponding metric. */
 class UIMetric
 {
+
 public:
 
@@ -134 +134 @@
 /** UIInformationPerformanceMonitor class displays some high level performance metric of the guest system.
   * The values are read in certain periods and cached in the GUI side. Currently we draw some line charts
-  * and pie charts (where applicable) alongside with some text. Additionally it displays a table including some
-  * run time attributes. */
+  * and pie charts (where applicable) alongside with some text. IPerformanceCollector and IMachineDebugger are
+  * two sources of the performance metrics. Unfortunately these two have very distinct APIs resulting a bit too much
+  * special casing etc.*/
 class UIInformationPerformanceMonitor : public QIWithRetranslateUI<QWidget>
 {
@@ -149 +150 @@
 
 protected:
+
     void retranslateUi();
 
 private slots:
+
     /** Reads the metric values for several sources and calls corresponding update functions. */
     void sltTimeout();
@@ -172 +175 @@
     /** Returns a QColor for the chart with @p strChartName and data series with @p iDataIndex. */
     QString dataColorString(const QString &strChartName, int iDataIndex);
-    /** Parses the xml string we get from the IMachineDebugger and returns an array of DebuggerMetricData. */
-    QVector<DebuggerMetricData> getTotalCounterFromDegugger(const QString &strQuery);
+    /** Parses the xml string we get from the IMachineDebugger and returns an array of UIDebuggerMetricData. */
+    QVector<UIDebuggerMetricData> getTotalCounterFromDegugger(const QString &strQuery);
 
     bool m_fGuestAdditionsAvailable;
@@ -191 +194 @@
     QMap<QString, UIMetric> m_subMetrics;
     QMap<QString,UIChart*>  m_charts;
-    QMap<QString,QLabel*>  m_infoLabels;
-    ComObjPtr<UIMainEventListenerImpl> m_pQtGuestListener;
+    /** 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.

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

@@ -26 +26 @@
 #include "UICommon.h"
 #include "UIConverter.h"
-#include "UIExtraDataManager.h"
 #include "UIIconPool.h"
 #include "UIInformationRuntime.h"
@@ -34 +33 @@
 #include "CGuest.h"
 #include "CVRDEServerInfo.h"
-
 
 enum InfoRow
@@ -486 +484 @@
 }
 
-UIInformationRuntime::~UIInformationRuntime()
-{
-}
-
 void UIInformationRuntime::retranslateUi()
 {

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

@@ -33 +33 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
-#include "UIMainEventListener.h"
-
 
 /* Forward declarations: */
 class QVBoxLayout;
-class QLabel;
-class UIChart;
 class UISession;
 class UIRuntimeInfoWidget;
@@ -55 +51 @@
       * @param console is machine console reference. */
     UIInformationRuntime(QWidget *pParent, const CMachine &machine, const CConsole &console, const UISession *pSession);
-    ~UIInformationRuntime();
 
 protected:
+
     void retranslateUi();
 
 private slots:
 
-    /** @name These functions are connected to API events and implement necessary updates.
+    /** @name These functions are connected to API events and implement necessary updates on the table.
       * @{ */
         void sltGuestAdditionsStateChange();
@@ -82 +78 @@
     QVBoxLayout *m_pMainLayout;
     UIRuntimeInfoWidget *m_pRuntimeInfoWidget;
-
-    QMap<QString,QLabel*>  m_infoLabels;
-    ComObjPtr<UIMainEventListenerImpl> m_pQtGuestListener;
 };