Changeset 83094 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 17, 2020 10:12:35 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Acquire current cloud machine state async way; Moreover, periodically, which resolves the need of state update when pause/resume issued.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/UITask.h (modified) (1 diff)
• src/manager/UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)
• src/manager/UIVirtualBoxManagerWidget.h (modified) (1 diff)
• src/manager/UIVirtualMachineItemCloud.cpp (modified) (7 diffs)
• src/manager/UIVirtualMachineItemCloud.h (modified) (3 diffs)

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

@@ -956 +956 @@
 VirtualBox_QT_MOCSRCS = \
         src/hostnetwork/UIHostNetworkManager.cpp \
+        src/manager/UIVirtualMachineItemCloud.cpp \
         src/manager/UIWelcomePane.cpp \
         src/snapshots/UISnapshotDetailsWidget.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/globals/UITask.h

@@ -47 +47 @@
         Type_DetailsPopulation     = 2,
         Type_CloudAcquireInstances = 3,
+        Type_GetCloudInstanceState = 4,
     };
 

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

@@ -284 +284 @@
 }
 
+void UIVirtualBoxManagerWidget::sltHandleCloudMachineStateChange(const QString &strId)
+{
+    /* Acquire current item: */
+    UIVirtualMachineItem *pItem = currentItem();
+
+    /* repeat the task only if we are still on the same item: */
+    if (pItem && pItem->id() == strId)
+        pItem->toCloud()->updateStateAsync(true /* delayed? */);
+
+    /* Pass the signal further: */
+    emit sigCloudMachineStateChange(strId);
+}
+
 void UIVirtualBoxManagerWidget::sltHandleToolMenuRequested(UIToolClass enmClass, const QPoint &position)
 {
@@ -373 +386 @@
                 /* Configure Chooser-pane: */
                 connect(m_pPaneChooser, &UIChooser::sigCloudMachineStateChange,
-                        this, &UIVirtualBoxManagerWidget::sigCloudMachineStateChange);
+                        this, &UIVirtualBoxManagerWidget::sltHandleCloudMachineStateChange);
                 /* Add into splitter: */
                 m_pSplitter->addWidget(m_pPaneChooser);
@@ -757 +770 @@
         /* Update current cloud machine state: */
         if (pItem->itemType() == UIVirtualMachineItem::ItemType_CloudReal)
-            pItem->toCloud()->updateState(this);
+            pItem->toCloud()->updateStateAsync(false /* delayed? */);
     }
     else

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

@@ -157 +157 @@
           * @param  enmDirection  Brings which direction was animation finished for. */
         void sltHandleSlidingAnimationComplete(SlidingDirection enmDirection);
+
+        /** Handles state change for cloud machine with specified @a strMachineId. */
+        void sltHandleCloudMachineStateChange(const QString &strId);
     /** @} */
 

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

@@ -16 +16 @@
  */
 
+/* Qt includes: */
+#include <QTimer>
+
 /* GUI includes: */
 #include "UICloudMachine.h"
@@ -22 +25 @@
 #include "UIIconPool.h"
 #include "UIMessageCenter.h"
+#include "UITask.h"
+#include "UIThreadPool.h"
 #include "UIVirtualMachineItemCloud.h"
 
@@ -45 +50 @@
 /* Using across module: */
 using namespace GetInstanceInfo;
+
+
+/** UITask extension used to get cloud instance state async way. */
+class UITaskGetCloudInstanceState : public UITask
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs task taking @a comCloudClient and @a strId as data.
+      * @param  comCloudClient  Brings the cloud client object.
+      * @param  strId           Brings the cloud VM id. */
+    UITaskGetCloudInstanceState(const CCloudClient &comCloudClient, const QString &strId);
+
+    /** Returns the task result. */
+    QString result() const;
+
+protected:
+
+    /** Contains the task body. */
+    virtual void run() /* override */;
+
+private:
+
+    /** Holds the mutex to access result. */
+    mutable QMutex  m_mutex;
+
+    /** Holds the cloud client object. */
+    CCloudClient  m_comCloudClient;
+    /** Holds the cloud VM id. */
+    QString       m_strId;
+
+    /** Holds the error info object. */
+    CVirtualBoxErrorInfo  m_comErrorInfo;
+
+    /** Holds the task result. */
+    QString  m_strResult;
+};
 
 
@@ -139 +182 @@
 
 /*********************************************************************************************************************************
+*   Class UITaskGetCloudInstanceState implementation.                                                                            *
+*********************************************************************************************************************************/
+
+UITaskGetCloudInstanceState::UITaskGetCloudInstanceState(const CCloudClient &comCloudClient, const QString &strId)
+    : UITask(Type_GetCloudInstanceState)
+    , m_comCloudClient(comCloudClient)
+    , m_strId(strId)
+{
+}
+
+QString UITaskGetCloudInstanceState::result() const
+{
+    m_mutex.lock();
+    const QString strResult = m_strResult;
+    m_mutex.unlock();
+    return strResult;
+}
+
+void UITaskGetCloudInstanceState::run()
+{
+    m_mutex.lock();
+    m_strResult = getInstanceInfo(KVirtualSystemDescriptionType_CloudInstanceState, m_comCloudClient, m_strId);
+    m_mutex.unlock();
+}
+
+
+/*********************************************************************************************************************************
 *   Class UIVirtualMachineItemCloud implementation.                                                                              *
 *********************************************************************************************************************************/
@@ -177 +247 @@
     /* Update state: */
     updateState(strState);
+}
+
+void UIVirtualMachineItemCloud::updateStateAsync(bool fDelayed)
+{
+    QTimer::singleShot(fDelayed ? 10000 : 0, this, SLOT(sltCreateGetCloudInstanceStateTask()));
 }
 
@@ -397 +472 @@
 }
 
+void UIVirtualMachineItemCloud::sltCreateGetCloudInstanceStateTask()
+{
+    /* Make sure item is of real cloud type and is initialized: */
+    AssertReturnVoid(itemType() == ItemType_CloudReal);
+    AssertPtrReturnVoid(m_pCloudMachine);
+
+    /* Create and start task to acquire state async way: */
+    UITask *pTask = new UITaskGetCloudInstanceState(m_pCloudMachine->client(), m_strId);
+    connect(pTask, &UITask::sigComplete,
+            this, &UIVirtualMachineItemCloud::sltHandleGetCloudInstanceStateDone);
+    uiCommon().threadPool()->enqueueTask(pTask);
+}
+
+void UIVirtualMachineItemCloud::sltHandleGetCloudInstanceStateDone(UITask *pTask)
+{
+    /* Skip unrelated tasks: */
+    if (!pTask || pTask->type() != UITask::Type_GetCloudInstanceState)
+        return;
+
+    /* Cast task to corresponding sub-class: */
+    UITaskGetCloudInstanceState *pStateTask = static_cast<UITaskGetCloudInstanceState*>(pTask);
+
+    /* Update state: */
+    updateState(pStateTask->result());
+}
+
 void UIVirtualMachineItemCloud::updateState(const QString &strState)
 {
@@ -415 +516 @@
     emit sigStateChange();
 }
+
+
+#include "UIVirtualMachineItemCloud.moc"

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

@@ -27 +27 @@
 /* Forward declarations: */
 class UICloudMachine;
+class UITask;
 
 /** UIVirtualMachineItem sub-class used as cloud Virtual Machine item interface. */
@@ -65 +66 @@
           * @param  pWidget  Brings parent widget to show messages according to. */
         void updateState(QWidget *pParent);
+
+        /** Updates cloud VM state async way, @a fDelayed if requested or instant otherwise. */
+        void updateStateAsync(bool fDelayed);
 
         /** Puts cloud VM on pause.
@@ -114 +118 @@
     /** @} */
 
+private slots:
+
+        /** Create cloud VM state acquire task. */
+        void sltCreateGetCloudInstanceStateTask();
+        /** Handles signal about cloud VM state acquire task is done. */
+        void sltHandleGetCloudInstanceStateDone(UITask *pTask);
+
 private: