Changeset 83345 in vbox for trunk

Timestamp:

Mar 20, 2020 9:24:43 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686. Renaming and moving some classes/files. take 2

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (6 diffs)
• src/monitor/performance/UIPerformanceMonitor.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationPerformanceMonitor.cpp ) (23 diffs)
• src/monitor/performance/UIPerformanceMonitor.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationPerformanceMonitor.h ) (5 diffs)
• src/monitor/resource/UIResourceMonitor.cpp (modified) (1 diff)
• src/runtime/information/UIVMInformationDialog.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -333 +333 @@
         ./src/manager/tools \
         ./src/monitor \
-        ./src/monitor/resource
+        ./src/monitor/resource \
+        ./src/monitor/performance
 
 ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -719 +720 @@
 VirtualBoxVM_QT_MOCHDRS = \
         src/globals/UIStarter.h \
+        src/monitor/performance/UIPerformanceMonitor.h \
         src/runtime/UIConsoleEventHandler.h \
         src/runtime/UIFrameBuffer.h \
@@ -737 +739 @@
         src/runtime/information/UIInformationConfiguration.h \
         src/runtime/information/UIVMInformationDialog.h \
-        src/runtime/information/UIInformationPerformanceMonitor.h \
         src/runtime/information/UIInformationRuntime.h \
         src/guestctrl/UIFileManager.h \
@@ -977 +978 @@
 #
 VirtualBoxVM_QT_MOCSRCS = \
+        src/monitor/performance/UIPerformanceMonitor.cpp \
         src/runtime/UIConsoleEventHandler.cpp \
         src/runtime/UIFrameBuffer.cpp \
         src/runtime/UIIndicatorsPool.cpp \
-        src/runtime/information/UIInformationPerformanceMonitor.cpp \
         src/runtime/information/UIInformationRuntime.cpp \
         src/guestctrl/UIFileManager.cpp \
@@ -1190 +1191 @@
         src/main.cpp \
         src/globals/UIStarter.cpp \
+        src/monitor/performance/UIPerformanceMonitor.cpp \
         src/runtime/UIConsoleEventHandler.cpp \
         src/runtime/UIFrameBuffer.cpp \
@@ -1208 +1210 @@
         src/runtime/information/UIInformationConfiguration.cpp \
         src/runtime/information/UIVMInformationDialog.cpp \
-        src/runtime/information/UIInformationPerformanceMonitor.cpp \
         src/runtime/information/UIInformationRuntime.cpp \
         src/guestctrl/UIFileManager.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/monitor/performance/UIPerformanceMonitor.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIInformationPerformanceMonitor class implementation.
+ * VBox Qt GUI - UIPerformanceMonitor class implementation.
  */
 
@@ -29 +29 @@
 /* GUI includes: */
 #include "UICommon.h"
-#include "UIInformationPerformanceMonitor.h"
+#include "UIPerformanceMonitor.h"
 #include "UISession.h"
 
@@ -779 +779 @@
 
 /*********************************************************************************************************************************
-*   UIInformationPerformanceMonitor implementation.                                                                              *
+*   UIPerformanceMonitor implementation.                                                                              *
 *********************************************************************************************************************************/
 
-UIInformationPerformanceMonitor::UIInformationPerformanceMonitor(QWidget *pParent, const CMachine &machine, const CConsole &console, const UISession *pSession)
+UIPerformanceMonitor::UIPerformanceMonitor(QWidget *pParent, const CMachine &machine, const CConsole &console, const UISession *pSession)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fGuestAdditionsAvailable(false)
@@ -800 +800 @@
         m_comGuest = m_console.GetGuest();
     m_fGuestAdditionsAvailable = guestAdditionsAvailable(6 /* minimum major version */);
-    connect(pSession, &UISession::sigAdditionsStateChange, this, &UIInformationPerformanceMonitor::sltGuestAdditionsStateChange);
+    connect(pSession, &UISession::sigAdditionsStateChange, this, &UIPerformanceMonitor::sltGuestAdditionsStateChange);
 
     prepareMetrics();
@@ -808 +808 @@
 }
 
-UIInformationPerformanceMonitor::~UIInformationPerformanceMonitor()
-{
-}
-
-void UIInformationPerformanceMonitor::retranslateUi()
+UIPerformanceMonitor::~UIPerformanceMonitor()
+{
+}
+
+void UIPerformanceMonitor::retranslateUi()
 {
     foreach (UIChart *pChart, m_charts)
@@ -877 +877 @@
 }
 
-void UIInformationPerformanceMonitor::prepareObjects()
+void UIPerformanceMonitor::prepareObjects()
 {
     m_pMainLayout = new QVBoxLayout(this);
@@ -887 +887 @@
     if (m_pTimer)
     {
-        connect(m_pTimer, &QTimer::timeout, this, &UIInformationPerformanceMonitor::sltTimeout);
+        connect(m_pTimer, &QTimer::timeout, this, &UIPerformanceMonitor::sltTimeout);
         m_pTimer->start(1000 * iPeriod);
     }
@@ -943 +943 @@
 }
 
-void UIInformationPerformanceMonitor::sltTimeout()
+void UIPerformanceMonitor::sltTimeout()
 {
     if (m_performanceMonitor.isNull())
@@ -1022 +1022 @@
 
 /* static */
-void UIInformationPerformanceMonitor::getNetworkLoad(CMachineDebugger &debugger, quint64 &uOutNetworkReceived, quint64 &uOutNetworkTransmitted)
+void UIPerformanceMonitor::getNetworkLoad(CMachineDebugger &debugger, quint64 &uOutNetworkReceived, quint64 &uOutNetworkTransmitted)
 {
     uOutNetworkReceived = 0;
@@ -1039 +1039 @@
 
 /* static */
-void UIInformationPerformanceMonitor::getDiskLoad(CMachineDebugger &debugger, quint64 &uOutDiskWritten, quint64 &uOutDiskRead)
+void UIPerformanceMonitor::getDiskLoad(CMachineDebugger &debugger, quint64 &uOutDiskWritten, quint64 &uOutDiskRead)
 {
     QVector<UIDebuggerMetricData> xmlData = getAndParseStatsFromDebugger(debugger, "/Public/Storage/*/Port*/Bytes*");
@@ -1054 +1054 @@
 
 /* static */
-void UIInformationPerformanceMonitor::getVMMExitCount(CMachineDebugger &debugger, quint64 &uOutVMMExitCount)
+void UIPerformanceMonitor::getVMMExitCount(CMachineDebugger &debugger, quint64 &uOutVMMExitCount)
 {
     QVector<UIDebuggerMetricData> xmlData = getAndParseStatsFromDebugger(debugger, "/PROF/CPU*/EM/RecordedExits");
@@ -1070 +1070 @@
  * @returns
  */
-void UIInformationPerformanceMonitor::sltGuestAdditionsStateChange()
+void UIPerformanceMonitor::sltGuestAdditionsStateChange()
 {
     bool fGuestAdditionsAvailable = guestAdditionsAvailable(6 /* minimum major version */);
@@ -1079 +1079 @@
 }
 
-void UIInformationPerformanceMonitor::prepareMetrics()
+void UIPerformanceMonitor::prepareMetrics()
 {
     m_performanceMonitor = uiCommon().virtualBox().GetPerformanceCollector();
@@ -1126 +1126 @@
 }
 
-bool UIInformationPerformanceMonitor::guestAdditionsAvailable(int iMinimumMajorVersion)
+bool UIPerformanceMonitor::guestAdditionsAvailable(int iMinimumMajorVersion)
 {
     if (m_comGuest.isNull())
@@ -1145 +1145 @@
 }
 
-void UIInformationPerformanceMonitor::enableDisableGuestAdditionDependedWidgets(bool fEnable)
+void UIPerformanceMonitor::enableDisableGuestAdditionDependedWidgets(bool fEnable)
 {
     for (QMap<QString, UIMetric>::const_iterator iterator =  m_metrics.begin();
@@ -1165 +1165 @@
 }
 
-void UIInformationPerformanceMonitor::updateCPUGraphsAndMetric(ULONG iExecutingPercentage, ULONG iOtherPercentage)
+void UIPerformanceMonitor::updateCPUGraphsAndMetric(ULONG iExecutingPercentage, ULONG iOtherPercentage)
 {
     UIMetric &CPUMetric = m_metrics[m_strCPUMetricName];
@@ -1190 +1190 @@
 }
 
-void UIInformationPerformanceMonitor::updateRAMGraphsAndMetric(quint64 iTotalRAM, quint64 iFreeRAM)
+void UIPerformanceMonitor::updateRAMGraphsAndMetric(quint64 iTotalRAM, quint64 iFreeRAM)
 {
     UIMetric &RAMMetric = m_metrics[m_strRAMMetricName];
@@ -1210 +1210 @@
 }
 
-void UIInformationPerformanceMonitor::updateNetworkGraphsAndMetric(quint64 iReceiveTotal, quint64 iTransmitTotal)
+void UIPerformanceMonitor::updateNetworkGraphsAndMetric(quint64 iReceiveTotal, quint64 iTransmitTotal)
 {
     UIMetric &NetMetric = m_metrics[m_strNetworkMetricName];
@@ -1253 +1253 @@
 }
 
-void UIInformationPerformanceMonitor::updateDiskIOGraphsAndMetric(quint64 uDiskIOTotalWritten, quint64 uDiskIOTotalRead)
+void UIPerformanceMonitor::updateDiskIOGraphsAndMetric(quint64 uDiskIOTotalWritten, quint64 uDiskIOTotalRead)
 {
     UIMetric &diskMetric = m_metrics[m_strDiskIOMetricName];
@@ -1296 +1296 @@
 }
 
-void UIInformationPerformanceMonitor::updateVMExitMetric(quint64 uTotalVMExits)
+void UIPerformanceMonitor::updateVMExitMetric(quint64 uTotalVMExits)
 {
     if (uTotalVMExits <= 0)
@@ -1329 +1329 @@
 }
 
-QString UIInformationPerformanceMonitor::dataColorString(const QString &strChartName, int iDataIndex)
+QString UIPerformanceMonitor::dataColorString(const QString &strChartName, int iDataIndex)
 {
     if (!m_charts.contains(strChartName))
@@ -1340 +1340 @@
 
 /* static */
-QVector<UIDebuggerMetricData> UIInformationPerformanceMonitor::getAndParseStatsFromDebugger(CMachineDebugger &debugger, const QString &strQuery)
+QVector<UIDebuggerMetricData> UIPerformanceMonitor::getAndParseStatsFromDebugger(CMachineDebugger &debugger, const QString &strQuery)
 {
     QVector<UIDebuggerMetricData> xmlData;
@@ -1369 +1369 @@
     return xmlData;
 }
-#include "UIInformationPerformanceMonitor.moc"
+#include "UIPerformanceMonitor.moc"

trunk/src/VBox/Frontends/VirtualBox/src/monitor/performance/UIPerformanceMonitor.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIInformationPerformanceMonitor class declaration.
+ * VBox Qt GUI - UIPerformanceMonitor class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_runtime_information_UIInformationPerformanceMonitor_h
-#define FEQT_INCLUDED_SRC_runtime_information_UIInformationPerformanceMonitor_h
+#ifndef FEQT_INCLUDED_SRC_monitor_performance_UIPerformanceMonitor_h
+#define FEQT_INCLUDED_SRC_monitor_performance_UIPerformanceMonitor_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -106 +106 @@
 };
 
-/** UIInformationPerformanceMonitor class displays some high level performance metric of the guest system.
+/** UIPerformanceMonitor 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. 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>
+class UIPerformanceMonitor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -120 +120 @@
       * @param machine is machine reference.
       * @param console is machine console reference. */
-    UIInformationPerformanceMonitor(QWidget *pParent, const CMachine &machine, const CConsole &console, const UISession *pSession);
-    ~UIInformationPerformanceMonitor();
+    UIPerformanceMonitor(QWidget *pParent, const CMachine &machine, const CConsole &console, const UISession *pSession);
+    ~UIPerformanceMonitor();
 
     /** @name Static utlity methods that query and parse IMachineDebugger outputs for specific metrix types.
@@ -227 +227 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_runtime_information_UIInformationPerformanceMonitor_h */
+#endif /* !FEQT_INCLUDED_SRC_monitor_performance_UIPerformanceMonitor_h */

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp

@@ -32 +32 @@
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
-#include "UIInformationPerformanceMonitor.h"
+#include "UIPerformanceMonitor.h"
 #include "UIResourceMonitor.h"
 #include "UIMessageCenter.h"

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

@@ -35 +35 @@
 #include "VBoxUtils.h"
 #include "UIInformationConfiguration.h"
-#include "UIInformationPerformanceMonitor.h"
+#include "UIPerformanceMonitor.h"
 #include "UIInformationRuntime.h"
 #include "UIGuestProcessControlWidget.h"
@@ -199 +199 @@
 
         /* Create Performance Monitor tab: */
-        UIInformationPerformanceMonitor *pPerformanceMonitorWidget =
-            new UIInformationPerformanceMonitor(this, m_pMachineWindow->machine(), m_pMachineWindow->console(), m_pMachineWindow->uisession());
+        UIPerformanceMonitor *pPerformanceMonitorWidget =
+            new UIPerformanceMonitor(this, m_pMachineWindow->machine(), m_pMachineWindow->console(), m_pMachineWindow->uisession());
         if (pPerformanceMonitorWidget)
         {