Changeset 86207 in vbox

Timestamp:

Sep 21, 2020 7:49:36 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: Rework UIVirtualMachineItemCloud to create cloud machine refresh progress and corresponding handler directly in the GUI thread instead of another thread executing UITaskCloudRefreshMachineInfo; Creating QObjects in other than the GUI thread seems to be restricted in latest Qt versions.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/manager/UITaskCloudRefreshMachineInfo.cpp (deleted)
• src/manager/UITaskCloudRefreshMachineInfo.h (deleted)
• src/manager/UIVirtualMachineItemCloud.cpp (modified) (5 diffs)
• src/manager/UIVirtualMachineItemCloud.h (modified) (4 diffs)

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

@@ -582 +582 @@
         src/manager/UITaskCloudGetSettingsForm.h \
         src/manager/UITaskCloudListMachines.h \
-        src/manager/UITaskCloudRefreshMachineInfo.h \
         src/manager/UIToolPaneGlobal.h \
         src/manager/UIToolPaneMachine.h \
@@ -1056 +1055 @@
         src/manager/UITaskCloudGetSettingsForm.cpp \
         src/manager/UITaskCloudListMachines.cpp \
-        src/manager/UITaskCloudRefreshMachineInfo.cpp \
         src/manager/UIToolPaneGlobal.cpp \
         src/manager/UIToolPaneMachine.cpp \

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

@@ -27 +27 @@
 #include "UIIconPool.h"
 #include "UIMessageCenter.h"
-#include "UITaskCloudRefreshMachineInfo.h"
+#include "UIProgressDialog.h"
 #include "UIThreadPool.h"
 #include "UIVirtualMachineItemCloud.h"
@@ -40 +40 @@
     , m_enmMachineState(KCloudMachineState_Invalid)
     , m_enmFakeCloudItemState(enmState)
-    , m_pTask(0)
-    , m_pEventLoop(0)
 {
     recache();
@@ -51 +49 @@
     , m_enmMachineState(KCloudMachineState_Invalid)
     , m_enmFakeCloudItemState(UIFakeCloudVirtualMachineItemState_NotApplicable)
-    , m_pTask(0)
-    , m_pEventLoop(0)
 {
     recache();
@@ -75 +71 @@
 void UIVirtualMachineItemCloud::updateInfoAsync(bool fDelayed)
 {
-    QTimer::singleShot(fDelayed ? 10000 : 0, this, SLOT(sltCreateGetCloudInstanceInfoTask()));
+    QTimer::singleShot(fDelayed ? 10000 : 0, this, SLOT(sltRefreshCloudMachineInfo()));
 }
 
 void UIVirtualMachineItemCloud::waitForAsyncInfoUpdateFinished()
 {
-    /* Make sure task is really created: */
-    if (!m_pTask)
-        return;
-
-    /* Cancel the task: */
-    m_pTask->cancel();
-
-    /* We are creating a locally-scoped event-loop object,
-     * but holding a pointer to it for a control needs: */
-    QEventLoop eventLoop;
-    m_pEventLoop = &eventLoop;
-
-    /* Guard ourself for the case
-     * we self-destroyed in our event-loop: */
-    QPointer<UIVirtualMachineItemCloud> guard = this;
-
-    /* Start the blocking event-loop: */
-    eventLoop.exec();
-
-    /* Event-loop object unblocked,
-     * Are we still valid? */
-    if (guard.isNull())
-        return;
-
-    /* Cleanup the pointer finally: */
-    m_pEventLoop = 0;
+    /* Cancel the progress-handler if any: */
+    if (m_pProgressHandler)
+        m_pProgressHandler->cancel();
 }
 
@@ -307 +280 @@
 }
 
-void UIVirtualMachineItemCloud::sltCreateGetCloudInstanceInfoTask()
+void UIVirtualMachineItemCloud::sltRefreshCloudMachineInfo()
 {
     /* Make sure item is of real cloud type and is initialized: */
     AssertReturnVoid(itemType() == UIVirtualMachineItemType_CloudReal);
 
-    /* Create and start task to refresh info async way only if there is no task yet: */
-    if (!m_pTask)
+    /* Ignore refresh request if there is progress already: */
+    if (m_pProgressHandler)
+        return;
+
+    /* Create 'Refresh' progress: */
+    m_comProgress = m_comCloudMachine.Refresh();
+    if (!m_comCloudMachine.isOk())
+        msgCenter().cannotAcquireCloudMachineParameter(m_comCloudMachine);
+    else
     {
-        m_pTask = new UITaskCloudRefreshMachineInfo(m_comCloudMachine);
-        connect(uiCommon().threadPoolCloud(), &UIThreadPool::sigTaskComplete,
-                this, &UIVirtualMachineItemCloud::sltHandleRefreshCloudMachineInfoDone);
-        uiCommon().threadPoolCloud()->enqueueTask(m_pTask);
+        /* Prepare 'Refresh' progress handler: */
+        m_pProgressHandler = new UIProgress(m_comProgress, this);
+        if (m_pProgressHandler)
+            connect(m_pProgressHandler, &UIProgress::sigProgressComplete,
+                    this, &UIVirtualMachineItemCloud::sltHandleRefreshCloudMachineInfoDone);
     }
 }
 
-void UIVirtualMachineItemCloud::sltHandleRefreshCloudMachineInfoDone(UITask *pTask)
-{
-    /* Skip unrelated tasks: */
-    if (!m_pTask || pTask != m_pTask)
-        return;
-
-    /* Mark our task handled: */
-    m_pTask = 0;
+void UIVirtualMachineItemCloud::sltHandleRefreshCloudMachineInfoDone()
+{
+    /* If not canceled => check progress result: */
+    if (   !m_comProgress.GetCanceled()
+        && (!m_comProgress.isOk() || m_comProgress.GetResultCode() != 0))
+            msgCenter().cannotAcquireCloudMachineParameter(m_comProgress);
 
     /* Recache: */
     recache();
 
-    /* Exit from the event-loop if there is any: */
-    if (m_pEventLoop)
-        m_pEventLoop->exit();
-    /* Notify listeners otherwise: */
-    else
+    /* If not canceled => notify listeners: */
+    if (!m_comProgress.GetCanceled())
         emit sigStateChange();
-}
+
+    /* Cleanup the handler and the progress: */
+    delete m_pProgressHandler;
+    m_pProgressHandler = 0;
+    m_comProgress = CProgress();
+}

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

@@ -22 +22 @@
 #endif
 
+/* Qt includes: */
+#include <QPointer>
+
 /* GUI includes: */
 #include "UIVirtualMachineItem.h"
@@ -28 +31 @@
 #include "COMEnums.h"
 #include "CCloudMachine.h"
+#include "CProgress.h"
 
 /* Forward declarations: */
-class UITask;
-class UITaskCloudRefreshMachineInfo;
+class UIProgress;
 
 /** UIVirtualMachineItem sub-class used as cloud Virtual Machine item interface. */
@@ -123 +126 @@
 private slots:
 
-        /** Create cloud VM info acquire task. */
-        void sltCreateGetCloudInstanceInfoTask();
-        /** Handles signal about cloud VM info refresh task is done. */
-        void sltHandleRefreshCloudMachineInfoDone(UITask *pTask);
+        /** Starts cloud VM info refresh progress. */
+        void sltRefreshCloudMachineInfo();
+        /** Handles signal about cloud VM info refresh progress is done. */
+        void sltHandleRefreshCloudMachineInfoDone();
 
 private:
@@ -146 +149 @@
         QString                             m_strFakeCloudItemErrorMessage;
 
-        /** Holds the info acquire task instance. */
-        UITaskCloudRefreshMachineInfo *m_pTask;
-        /** Holds the task waiting loop instance. */
-        QEventLoop                    *m_pEventLoop;
+        /** Holds the machine refresh progress object instance. */
+        CProgress             m_comProgress;
+        /** Holds the machine refresh progress handler instance. */
+        QPointer<UIProgress>  m_pProgressHandler;
     /** @} */
 };