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

Timestamp:

Feb 9, 2023 11:24:06 AM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Rework CMachineDebugger wrapper usage the way it's fully encapsulated inside UISession.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (3 diffs)
• notificationcenter/UINotificationObjects.h (modified) (3 diffs)
• runtime/UIIndicatorsPool.cpp (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (3 diffs)
• runtime/UIMachine.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (3 diffs)
• runtime/UIMachineLogic.h (modified) (2 diffs)
• runtime/UIMachineView.cpp (modified) (1 diff)
• runtime/UIMachineView.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -62 +62 @@
 #include "CHostOnlyNetwork.h"
 #include "CKeyboard.h"
+#include "CMachineDebugger.h"
 #include "CMediumAttachment.h"
 #include "CMouse.h"
@@ -670 +671 @@
 
 /* static */
+void UINotificationMessage::cannotAcquireMachineDebuggerParameter(const CMachineDebugger &comMachineDebugger)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Debugger failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to acquire machine debugger parameter.") +
+        UIErrorString::formatErrorInfo(comMachineDebugger));
+}
+
+/* static */
 void UINotificationMessage::cannotAcquireConsoleParameter(const CConsole &comConsole)
 {
@@ -834 +844 @@
                                                    .arg(CMachine(comMachine).GetName()) +
         UIErrorString::formatErrorInfo(comMachine));
+}
+
+/* static */
+void UINotificationMessage::cannotChangeMachineDebuggerParameter(const CMachineDebugger &comMachineDebugger)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Debugger failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to change the parameter of machine debugger.") +
+        UIErrorString::formatErrorInfo(comMachineDebugger));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -73 +73 @@
 class CEmulatedUSB;
 class CKeyboard;
+class CMachineDebugger;
 class CMouse;
 class CNetworkAdapter;
@@ -295 +296 @@
           * @param  comMachine  Brings the object parameter get acquired from. */
         static void cannotAcquireMachineParameter(const CMachine &comMachine);
+        /** Notifies about inability to acquire IMachineDebugger parameter.
+          * @param  comMachineDebugger  Brings the object parameter get acquired from. */
+        static void cannotAcquireMachineDebuggerParameter(const CMachineDebugger &comMachineDebugger);
         /** Notifies about inability to acquire IConsole parameter.
           * @param  comConsole  Brings the object parameter get acquired from. */
@@ -353 +357 @@
           * @param  comMachine  Brings the object parameter being changed for. */
         static void cannotChangeMachineParameter(const CMachine &comMachine);
+        /** Notifies about inability to change IMachineDebugger parameter.
+          * @param  comMachineDebugger  Brings the object parameter being changed for. */
+        static void cannotChangeMachineDebuggerParameter(const CMachineDebugger &comMachineDebugger);
         /** Notifies about inability to change IGraphicsAdapter parameter.
           * @param  comAdapter  Brings the object parameter being changed for. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -742 +742 @@
     void sltHandleTimeout()
     {
-        m_pMachine->acquireCpuLoadPercentage(m_iCPULoadPercentage);
+        m_iCPULoadPercentage = m_pMachine->cpuLoadPercentage();
         update();
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -534 +534 @@
 }
 
-void UIMachine::acquireCpuLoadPercentage(int &iPercentage)
-{
-    uisession()->acquireCpuLoadPercentage(iPercentage);
-}
-
 void UIMachine::acquireFeaturesStatusInfo(QString &strInfo, KVMExecutionEngine &enmEngine)
 {
@@ -546 +541 @@
                                            isHWVirtExUXEnabled(),
                                            paravirtProvider());
+}
+
+void UIMachine::setLogEnabled(bool fEnabled)
+{
+    uisession()->setLogEnabled(fEnabled);
+}
+
+bool UIMachine::isLogEnabled()
+{
+    return uisession()->isLogEnabled();
+}
+
+int UIMachine::cpuLoadPercentage()
+{
+    return uisession()->cpuLoadPercentage();
 }
 
@@ -1890 +1900 @@
 void UIMachine::updateVirtualizationState()
 {
-    m_enmVMExecutionEngine = uisession()->debugger().GetExecutionEngine();
-    m_fIsHWVirtExNestedPagingEnabled = uisession()->debugger().GetHWVirtExNestedPagingEnabled();
-    m_fIsHWVirtExUXEnabled = uisession()->debugger().GetHWVirtExUXEnabled();
+    m_enmVMExecutionEngine = uisession()->executionEngineType();
+    m_fIsHWVirtExNestedPagingEnabled = uisession()->isHwVirtExNestedPagingEnabled();
+    m_fIsHWVirtExUXEnabled = uisession()->isHwVirtExUXEnabled();
     m_enmParavirtProvider = uisession()->machine().GetEffectiveParavirtProvider();
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -419 +419 @@
         /** Acquires status info for Recording indicator. */
         void acquireRecordingStatusInfo(QString &strInfo, bool &fRecordingEnabled, bool &fMachinePaused);
-        /** Acquires CPU load @a iPercentage. */
-        void acquireCpuLoadPercentage(int &iPercentage);
         /** Acquires status info for Features indicator. */
         void acquireFeaturesStatusInfo(QString &strInfo, KVMExecutionEngine &enmEngine);
+    /** @} */
+
+    /** @name Debugger stuff.
+     ** @{ */
+        /** Defines whether log is @a fEnabled. */
+        void setLogEnabled(bool fEnabled);
+        /** Returns whether log is enabled. */
+        bool isLogEnabled();
+
+        /** Returns CPU load percentage. */
+        int cpuLoadPercentage();
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -307 +307 @@
 {
     return uisession()->guest();
-}
-
-CMachineDebugger& UIMachineLogic::debugger() const
-{
-    return uisession()->debugger();
 }
 
@@ -2484 +2479 @@
 void UIMachineLogic::sltLoggingToggled(bool fState)
 {
-    NOREF(fState);
-    if (!debugger().isNull() && debugger().isOk())
-        debugger().SetLogEnabled(fState);
+    uimachine()->setLogEnabled(fState);
 }
 
@@ -3000 +2993 @@
 void UIMachineLogic::updateMenuDebug(QMenu*)
 {
-    /* The "Logging" item. */
-    bool fEnabled = false;
-    bool fChecked = false;
-    if (!debugger().isNull() && debugger().isOk())
-    {
-        fEnabled = true;
-        fChecked = debugger().GetLogEnabled() != FALSE;
-    }
-    if (fEnabled != actionPool()->action(UIActionIndexRT_M_Debug_T_Logging)->isEnabled())
-        actionPool()->action(UIActionIndexRT_M_Debug_T_Logging)->setEnabled(fEnabled);
-    if (fChecked != actionPool()->action(UIActionIndexRT_M_Debug_T_Logging)->isChecked())
-        actionPool()->action(UIActionIndexRT_M_Debug_T_Logging)->setChecked(fChecked);
+    const bool fEnabled = uimachine()->isLogEnabled();
+    actionPool()->action(UIActionIndexRT_M_Debug_T_Logging)->blockSignals(true);
+    actionPool()->action(UIActionIndexRT_M_Debug_T_Logging)->setChecked(fEnabled);
+    actionPool()->action(UIActionIndexRT_M_Debug_T_Logging)->blockSignals(false);
 }
 #endif /* VBOX_WITH_DEBUGGER_GUI */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -60 +60 @@
 class CGuest;
 class CMouse;
-class CMachineDebugger;
 class CSnapshot;
 class CUSBDevice;
@@ -128 +127 @@
     /** Returns the console's guest reference. */
     CGuest& guest() const;
-    /** Returns the console's debugger reference. */
-    CMachineDebugger& debugger() const;
 
     /** Returns the machine name. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -1455 +1455 @@
 {
     return uisession()->display();
-}
-
-CGuest& UIMachineView::guest() const
-{
-    return uisession()->guest();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -282 +282 @@
     /** Returns the console's display reference. */
     CDisplay& display() const;
-    /** Returns the console's guest reference. */
-    CGuest& guest() const;
 
     /* Protected getters: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -463 +463 @@
 }
 
-void UISession::acquireCpuLoadPercentage(int &iPercentage)
+void UISession::acquireFeaturesStatusInfo(QString &strInfo, KVMExecutionEngine &enmEngine,
+                                          bool fNestedPagingEnabled, bool fUxEnabled,
+                                          KParavirtProvider enmProvider)
+{
+    CMachine comMachine = machine();
+    UIDetailsGenerator::acquireFeaturesStatusInfo(comMachine, strInfo,
+                                                  enmEngine,
+                                                  fNestedPagingEnabled, fUxEnabled,
+                                                  enmProvider);
+}
+
+void UISession::setLogEnabled(bool fEnabled)
+{
+    CMachineDebugger comDebugger = debugger();
+    comDebugger.SetLogEnabled(fEnabled ? TRUE : FALSE);
+    if (!comDebugger.isOk())
+        UINotificationMessage::cannotChangeMachineDebuggerParameter(comDebugger);
+}
+
+bool UISession::isLogEnabled()
+{
+    CMachineDebugger comDebugger = debugger();
+    const BOOL fEnabled = comDebugger.GetLogEnabled();
+    if (!comDebugger.isOk())
+        UINotificationMessage::cannotAcquireMachineDebuggerParameter(comDebugger);
+    return fEnabled == TRUE;
+}
+
+KVMExecutionEngine UISession::executionEngineType()
+{
+    CMachineDebugger comDebugger = debugger();
+    const KVMExecutionEngine enmEngine = comDebugger.GetExecutionEngine();
+    if (!comDebugger.isOk())
+        UINotificationMessage::cannotAcquireMachineDebuggerParameter(comDebugger);
+    return enmEngine;
+}
+
+bool UISession::isHwVirtExNestedPagingEnabled()
+{
+    CMachineDebugger comDebugger = debugger();
+    const BOOL fEnabled = comDebugger.GetHWVirtExNestedPagingEnabled();
+    if (!comDebugger.isOk())
+        UINotificationMessage::cannotAcquireMachineDebuggerParameter(comDebugger);
+    return fEnabled == TRUE;
+}
+
+bool UISession::isHwVirtExUXEnabled()
+{
+    CMachineDebugger comDebugger = debugger();
+    const BOOL fEnabled = comDebugger.GetHWVirtExUXEnabled();
+    if (!comDebugger.isOk())
+        UINotificationMessage::cannotAcquireMachineDebuggerParameter(comDebugger);
+    return fEnabled == TRUE;
+}
+
+int UISession::cpuLoadPercentage()
 {
     CMachineDebugger comDebugger = debugger();
@@ -470 +525 @@
     ULONG uPctOther;
     comDebugger.GetCPULoad(0x7fffffff, uPctExecuting, uPctHalted, uPctOther);
-    iPercentage = uPctExecuting + uPctOther;
-}
-
-void UISession::acquireFeaturesStatusInfo(QString &strInfo, KVMExecutionEngine &enmEngine,
-                                          bool fNestedPagingEnabled, bool fUxEnabled,
-                                          KParavirtProvider enmProvider)
-{
-    CMachine comMachine = machine();
-    UIDetailsGenerator::acquireFeaturesStatusInfo(comMachine, strInfo,
-                                                  enmEngine,
-                                                  fNestedPagingEnabled, fUxEnabled,
-                                                  enmProvider);
+    if (!comDebugger.isOk())
+        UINotificationMessage::cannotAcquireMachineDebuggerParameter(comDebugger);
+    return uPctExecuting + uPctOther;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -319 +319 @@
         /** Acquires status info for Recording indicator. */
         void acquireRecordingStatusInfo(QString &strInfo, bool &fRecordingEnabled, bool &fMachinePaused);
-        /** Acquires CPU load @a iPercentage. */
-        void acquireCpuLoadPercentage(int &iPercentage);
         /** Acquires status info for Features indicator. */
         void acquireFeaturesStatusInfo(QString &strInfo, KVMExecutionEngine &enmEngine,
                                        bool fNestedPagingEnabled, bool fUxEnabled,
                                        KParavirtProvider enmProvider);
+    /** @} */
+
+    /** @name Debugger stuff.
+     ** @{ */
+        /** Defines whether log is @a fEnabled. */
+        void setLogEnabled(bool fEnabled);
+        /** Returns whether log is enabled. */
+        bool isLogEnabled();
+
+        /** Returns VM's execution engine type. */
+        KVMExecutionEngine executionEngineType();
+        /** Returns whether nested paging hardware virtualization extension is enabled. */
+        bool isHwVirtExNestedPagingEnabled();
+        /** Returns whether UX hardware virtualization extension is enabled. */
+        bool isHwVirtExUXEnabled();
+
+        /** Returns CPU load percentage. */
+        int cpuLoadPercentage();
     /** @} */