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

Timestamp:

Jan 11, 2024 12:12:42 PM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: Chooser pane: A bit of cleanup for cloud VM update processing; More careful manual control over the repeated update scheduling.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualMachineItemCloud.cpp (modified) (6 diffs)
• UIVirtualMachineItemCloud.h (modified) (2 diffs)
• chooser/UIChooserAbstractModel.cpp (modified) (1 diff)
• chooser/UIChooserItemMachine.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.cpp

@@ -114 +114 @@
     , m_enmMachineState(KCloudMachineState_Invalid)
     , m_enmFakeCloudItemState(enmState)
-    , m_fRefreshScheduled(false)
+    , m_fUpdateRequiredByLocalReason(false)
     , m_pProgressTaskRefresh(0)
 {
@@ -125 +125 @@
     , m_enmMachineState(KCloudMachineState_Invalid)
     , m_enmFakeCloudItemState(UIFakeCloudVirtualMachineItemState_NotApplicable)
-    , m_fRefreshScheduled(false)
+    , m_fUpdateRequiredByLocalReason(false)
     , m_pProgressTaskRefresh(0)
 {
@@ -148 +148 @@
 }
 
-void UIVirtualMachineItemCloud::updateInfoAsync(bool fDelayed, bool fSubscribe /* = false */)
+void UIVirtualMachineItemCloud::setUpdateRequiredByLocalReason(bool fRequired)
+{
+    m_fUpdateRequiredByLocalReason = fRequired;
+}
+
+void UIVirtualMachineItemCloud::updateInfoAsync(bool fDelayed)
 {
     /* Ignore refresh request if progress-task is absent: */
     if (!m_pProgressTaskRefresh)
         return;
-
-    /* Mark update scheduled if requested: */
-    if (fSubscribe)
-        m_fRefreshScheduled = true;
 
     /* Schedule refresh request in a 10 or 0 seconds
@@ -165 +166 @@
 }
 
-void UIVirtualMachineItemCloud::stopAsyncUpdates()
+void UIVirtualMachineItemCloud::waitForAsyncInfoUpdateFinished()
 {
     /* Ignore cancel request if progress-task is absent: */
@@ -172 +173 @@
 
     /* Mark update canceled in any case: */
-    m_fRefreshScheduled = false;
-}
-
-void UIVirtualMachineItemCloud::waitForAsyncInfoUpdateFinished()
-{
-    /* Ignore cancel request if progress-task is absent: */
-    if (!m_pProgressTaskRefresh)
-        return;
-
-    /* Mark update canceled in any case: */
-    m_fRefreshScheduled = false;
+    m_fUpdateRequiredByLocalReason = false;
 
     /* Cancel refresh request
@@ -400 +391 @@
     emit sigRefreshFinished();
 
-    /* Refresh again if scheduled: */
-    if (m_fRefreshScheduled)
-        updateInfoAsync(true /* async? */);
+    /* Refresh again if required: */
+    if (m_fUpdateRequiredByLocalReason)
+        updateInfoAsync(true /* delayed? */);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.h

@@ -84 +84 @@
         QString fakeCloudItemErrorMessage() const { return m_strFakeCloudItemErrorMessage; }
 
-        /** Updates cloud VM info async way, @a fDelayed if requested or instant otherwise.
-          * @param  fSubscribe  Brings whether this update should be performed periodically. */
-        void updateInfoAsync(bool fDelayed, bool fSubscribe = false);
-        /** Stop periodical updates previously requested. */
-        void stopAsyncUpdates();
+        /** Defines whether update is @a fRequired by local reason. */
+        void setUpdateRequiredByLocalReason(bool fRequired);
+        /** Updates cloud VM info async way, @a fDelayed if requested or instantly otherwise. */
+        void updateInfoAsync(bool fDelayed);
         /** Makes sure async info update is finished.
           * @note  This method creates own event-loop to avoid blocking calling thread event processing,
@@ -166 +165 @@
         QString                             m_strFakeCloudItemErrorMessage;
 
-        /** Holds whether we plan to refresh info. */
-        bool            m_fRefreshScheduled;
+        /** Holds whether update is required by local reason. */
+        bool            m_fUpdateRequiredByLocalReason;
         /** Holds the refresh progress-task instance. */
         UIProgressTask *m_pProgressTaskRefresh;

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -1647 +1647 @@
     {
         AssertReturnVoid(pNode && pNode->cacheType() == UIVirtualMachineItemType_CloudReal);
-        pNode->cache()->toCloud()->updateInfoAsync(false /* delayed? */);
+        UIVirtualMachineItemCloud *pCloudMachineItem = pNode->cache()->toCloud();
+        pCloudMachineItem->updateInfoAsync(false /* delayed? */);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -241 +241 @@
         UIVirtualMachineItemCloud *pCloudMachineItem = cache()->toCloud();
         AssertPtrReturnVoid(pCloudMachineItem);
-        if (fSelected && pCloudMachineItem->accessible())
-            pCloudMachineItem->updateInfoAsync(false /* delayed? */, true /* subscribe */);
-        else
-            pCloudMachineItem->stopAsyncUpdates();
+        const bool fUpdateRequired = fSelected && pCloudMachineItem->accessible();
+        pCloudMachineItem->setUpdateRequiredByLocalReason(fUpdateRequired);
+        if (fUpdateRequired)
+            pCloudMachineItem->updateInfoAsync(false /* delayed? */);
     }
 }