Changeset 98602 in vbox

Timestamp:

Feb 16, 2023 1:40:24 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Cleanup for arguments of machine debugger wrappers.

Location:

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

Files:

• UIIndicatorsPool.cpp (modified) (4 diffs)
• UIMachine.cpp (modified) (2 diffs)
• UIMachine.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (1 diff)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (1 diff)

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

@@ -690 +690 @@
     UIIndicatorFeatures(UIMachine *pMachine)
         : UISessionStateStatusBarIndicator(IndicatorType_Features, pMachine)
-        , m_iCPULoadPercentage(0)
+        , m_uEffectiveCPULoad(0)
     {
         /* Assign state-icons: */
@@ -731 +731 @@
         painter.setBrush(gradient);
         /* Use 20% of the icon width to draw the indicator bar: */
-        painter.drawRect(QRect(QPoint(0.8 * width(), (100 - m_iCPULoadPercentage) / 100.f * height()),
+        painter.drawRect(QRect(QPoint(0.8 * width(), (100 - m_uEffectiveCPULoad) / 100.f * height()),
                                QPoint(width(),  height())));
         /* Draw an empty rect. around the CPU load bar: */
@@ -760 +760 @@
     void sltHandleTimeout()
     {
-        m_iCPULoadPercentage = m_pMachine->cpuLoadPercentage();
+        m_pMachine->acquireEffectiveCPULoad(m_uEffectiveCPULoad);
         update();
     }
@@ -782 +782 @@
     QTimer *m_pTimerAutoUpdate;
 
-    /** Holds the current CPU load percentage. */
-    int  m_iCPULoadPercentage;
+    /** Holds the effective CPU load. */
+    ulong  m_uEffectiveCPULoad;
 };
 

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

@@ -605 +605 @@
 }
 
-void UIMachine::setLogEnabled(bool fEnabled)
-{
-    uisession()->setLogEnabled(fEnabled);
-}
-
-bool UIMachine::isLogEnabled()
-{
-    return uisession()->isLogEnabled();
-}
-
-int UIMachine::cpuLoadPercentage()
-{
-    return uisession()->cpuLoadPercentage();
+bool UIMachine::setLogEnabled(bool fEnabled)
+{
+    return uisession()->setLogEnabled(fEnabled);
+}
+
+bool UIMachine::acquireWhetherLogEnabled(bool &fEnabled)
+{
+    return uisession()->acquireWhetherLogEnabled(fEnabled);
+}
+
+bool UIMachine::acquireEffectiveCPULoad(ulong &uLoad)
+{
+    return uisession()->acquireEffectiveCPULoad(uLoad);
 }
 
@@ -1966 +1966 @@
 void UIMachine::updateVirtualizationState()
 {
-    m_enmVMExecutionEngine = uisession()->executionEngineType();
-    m_fIsHWVirtExNestedPagingEnabled = uisession()->isHwVirtExNestedPagingEnabled();
-    m_fIsHWVirtExUXEnabled = uisession()->isHwVirtExUXEnabled();
+    uisession()->acquireExecutionEngineType(m_enmVMExecutionEngine);
+    uisession()->acquireWhetherHwVirtExNestedPagingEnabled(m_fIsHWVirtExNestedPagingEnabled);
+    uisession()->acquireWhetherHwVirtExUXEnabled(m_fIsHWVirtExUXEnabled);
     m_enmParavirtProvider = uisession()->machine().GetEffectiveParavirtProvider();
 }

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

@@ -453 +453 @@
      ** @{ */
         /** Defines whether log is @a fEnabled. */
-        void setLogEnabled(bool fEnabled);
-        /** Returns whether log is enabled. */
-        bool isLogEnabled();
-
-        /** Returns CPU load percentage. */
-        int cpuLoadPercentage();
+        bool setLogEnabled(bool fEnabled);
+        /** Acquires whether log is @a fEnabled. */
+        bool acquireWhetherLogEnabled(bool &fEnabled);
+
+        /** Acquires effective CPU @a uLoad. */
+        bool acquireEffectiveCPULoad(ulong &uLoad);
     /** @} */
 

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

@@ -3005 +3005 @@
 void UIMachineLogic::updateMenuDebug(QMenu*)
 {
-    const bool fEnabled = uimachine()->isLogEnabled();
+    bool fEnabled = false;
+    uimachine()->acquireWhetherLogEnabled(fEnabled);
     actionPool()->action(UIActionIndexRT_M_Debug_T_Logging)->blockSignals(true);
     actionPool()->action(UIActionIndexRT_M_Debug_T_Logging)->setChecked(fEnabled);

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

@@ -640 +640 @@
 }
 
-void UISession::setLogEnabled(bool fEnabled)
+bool UISession::setLogEnabled(bool fEnabled)
 {
     CMachineDebugger comDebugger = debugger();
     comDebugger.SetLogEnabled(fEnabled ? TRUE : FALSE);
-    if (!comDebugger.isOk())
+    const bool fSuccess = comDebugger.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotChangeMachineDebuggerParameter(comDebugger);
-}
-
-bool UISession::isLogEnabled()
+    return fSuccess;
+}
+
+bool UISession::acquireWhetherLogEnabled(bool &fEnabled)
 {
     CMachineDebugger comDebugger = debugger();
-    const BOOL fEnabled = comDebugger.GetLogEnabled();
-    if (!comDebugger.isOk())
+    const BOOL fLogEnabled = comDebugger.GetLogEnabled();
+    const bool fSuccess = comDebugger.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotAcquireMachineDebuggerParameter(comDebugger);
-    return fEnabled == TRUE;
-}
-
-KVMExecutionEngine UISession::executionEngineType()
+    else
+        fEnabled = fLogEnabled == TRUE;
+    return fSuccess;
+}
+
+bool UISession::acquireExecutionEngineType(KVMExecutionEngine &enmType)
 {
     CMachineDebugger comDebugger = debugger();
-    const KVMExecutionEngine enmEngine = comDebugger.GetExecutionEngine();
-    if (!comDebugger.isOk())
+    const KVMExecutionEngine enmEngineType = comDebugger.GetExecutionEngine();
+    const bool fSuccess = comDebugger.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotAcquireMachineDebuggerParameter(comDebugger);
-    return enmEngine;
-}
-
-bool UISession::isHwVirtExNestedPagingEnabled()
+    else
+        enmType = enmEngineType;
+    return fSuccess;
+}
+
+bool UISession::acquireWhetherHwVirtExNestedPagingEnabled(bool &fEnabled)
 {
     CMachineDebugger comDebugger = debugger();
-    const BOOL fEnabled = comDebugger.GetHWVirtExNestedPagingEnabled();
-    if (!comDebugger.isOk())
+    const BOOL fFeatureEnabled = comDebugger.GetHWVirtExNestedPagingEnabled();
+    const bool fSuccess = comDebugger.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotAcquireMachineDebuggerParameter(comDebugger);
-    return fEnabled == TRUE;
-}
-
-bool UISession::isHwVirtExUXEnabled()
+    else
+        fEnabled = fFeatureEnabled == TRUE;
+    return fSuccess;
+}
+
+bool UISession::acquireWhetherHwVirtExUXEnabled(bool &fEnabled)
 {
     CMachineDebugger comDebugger = debugger();
-    const BOOL fEnabled = comDebugger.GetHWVirtExUXEnabled();
-    if (!comDebugger.isOk())
+    const BOOL fFeatureEnabled = comDebugger.GetHWVirtExUXEnabled();
+    const bool fSuccess = comDebugger.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotAcquireMachineDebuggerParameter(comDebugger);
-    return fEnabled == TRUE;
-}
-
-int UISession::cpuLoadPercentage()
+    else
+        fEnabled = fFeatureEnabled == TRUE;
+    return fSuccess;
+}
+
+bool UISession::acquireEffectiveCPULoad(ulong &uLoad)
 {
     CMachineDebugger comDebugger = debugger();
@@ -691 +705 @@
     ULONG uPctOther;
     comDebugger.GetCPULoad(0x7fffffff, uPctExecuting, uPctHalted, uPctOther);
-    if (!comDebugger.isOk())
+    const bool fSuccess = comDebugger.isOk();
+    if (!fSuccess)
         UINotificationMessage::cannotAcquireMachineDebuggerParameter(comDebugger);
-    return uPctExecuting + uPctOther;
+    else
+        uLoad = uPctExecuting + uPctOther;
+    return fSuccess;
 }
 

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

@@ -355 +355 @@
      ** @{ */
         /** 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();
+        bool setLogEnabled(bool fEnabled);
+        /** Acquires whether log is @a fEnabled. */
+        bool acquireWhetherLogEnabled(bool &fEnabled);
+
+        /** Acquires VM's execution engine @a enmType. */
+        bool acquireExecutionEngineType(KVMExecutionEngine &enmType);
+        /** Acquires whether nested paging hardware virtualization extension is @a fEnabled. */
+        bool acquireWhetherHwVirtExNestedPagingEnabled(bool &fEnabled);
+        /** Acquires whether UX hardware virtualization extension is @a fEnabled. */
+        bool acquireWhetherHwVirtExUXEnabled(bool &fEnabled);
+
+        /** Acquires effective CPU @a uLoad. */
+        bool acquireEffectiveCPULoad(ulong &uLoad);
     /** @} */