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

Timestamp:

Jan 5, 2024 2:29:14 PM (13 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10501. Checking the cloud vm machine state more frequently.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity

Files:

• UIVMActivityMonitor.cpp (modified) (7 diffs)
• UIVMActivityMonitor.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -1932 +1932 @@
 UIVMActivityMonitorCloud::UIVMActivityMonitorCloud(EmbedTo enmEmbedding, QWidget *pParent, const CCloudMachine &machine)
     :UIVMActivityMonitor(enmEmbedding, pParent, 60 /* iMaximumQueueSize */)
+    , m_pMachineStateUpdateTimer(0)
+    , m_enmMachineState(KCloudMachineState_Invalid)
 {
     m_metricTypeNames[KMetricType_CpuUtilization] = m_strCPUMetricName;
@@ -1942 +1944 @@
     setMachine(machine);
     determineTotalRAMAmount();
+
+    m_pMachineStateUpdateTimer = new QTimer(this);
+    if (m_pMachineStateUpdateTimer)
+        connect(m_pMachineStateUpdateTimer, &QTimer::timeout, this, &UIVMActivityMonitorCloud::sltMachineStateUpdateTimeout);
 
     prepareMetrics();
@@ -1952 +1958 @@
     resetRAMInfoLabel();
 
-    if (m_comMachine.isOk())
-    {
-        m_ReadListProgressTask = new UIProgressTaskReadCloudMachineMetricList(this, m_comMachine);
-        if (m_ReadListProgressTask)
-            connect(m_ReadListProgressTask, &UIProgressTaskReadCloudMachineMetricList::sigMetricListReceived,
-                    this, &UIVMActivityMonitorCloud::sltMetricNameListingComplete);
-    }
     /* Start the timer: */
     start();
@@ -2008 +2007 @@
 }
 
+void UIVMActivityMonitorCloud::sltMachineStateUpdateTimeout()
+{
+    if (!m_comMachine.isOk())
+        return;
+
+    KCloudMachineState enmNewState = m_comMachine.GetState();
+    /* No changes. Noting to do: */
+    if (m_enmMachineState == enmNewState)
+        return;
+
+    if (m_ReadListProgressTask)
+    {
+        disconnect(m_ReadListProgressTask, &UIProgressTaskReadCloudMachineMetricList::sigMetricListReceived,
+                   this, &UIVMActivityMonitorCloud::sltMetricNameListingComplete);
+        delete m_ReadListProgressTask;
+    }
+
+    if (enmNewState == KCloudMachineState_Running)
+    {
+        m_ReadListProgressTask = new UIProgressTaskReadCloudMachineMetricList(this, m_comMachine);
+        if (m_ReadListProgressTask)
+        {
+            connect(m_ReadListProgressTask, &UIProgressTaskReadCloudMachineMetricList::sigMetricListReceived,
+                    this, &UIVMActivityMonitorCloud::sltMetricNameListingComplete);
+            m_ReadListProgressTask->start();
+        }
+        setEnabled(true);
+        /* Every minute: */
+        if (m_pTimer)
+            m_pTimer->start(1000 * 60);
+    }
+    else
+    {
+        reset();
+        if (m_pTimer)
+            m_pTimer->stop();
+    }
+    m_enmMachineState = enmNewState;
+}
+
 void UIVMActivityMonitorCloud::sltMetricNameListingComplete(QVector<QString> metricNameList)
 {
@@ -2018 +2057 @@
 
     sender()->deleteLater();
+    obtainDataAndUpdate();
 }
 
@@ -2076 +2116 @@
 void UIVMActivityMonitorCloud::obtainDataAndUpdate()
 {
-    /* No need to refresh cached values of the ICloudMachine since it has been already done
-     * by the VM list related class. Just fetch the machine attribute here:  */
-    if (!m_comMachine.isOk() || m_comMachine.GetState() != KCloudMachineState_Running)
-    {
-        setEnabled(false);
-        return;
-    }
-    if (!isEnabled())
-        setEnabled(true);
-    if (m_ReadListProgressTask && !m_ReadListProgressTask->isRunning())
-        m_ReadListProgressTask->start();
     foreach (const KMetricType &enmMetricType, m_availableMetricTypes)
     {
@@ -2113 +2142 @@
     return QString();
 }
-void UIVMActivityMonitorCloud::reset(){}
+void UIVMActivityMonitorCloud::reset()
+{
+    setEnabled(false);
+
+    if (m_pTimer)
+        m_pTimer->stop();
+    /* reset the metrics. this will delete their data cache: */
+    for (QMap<QString, UIMetric>::iterator iterator =  m_metrics.begin();
+         iterator != m_metrics.end(); ++iterator)
+        iterator.value().reset();
+    /* force update on the charts to draw now emptied metrics' data: */
+    for (QMap<QString, UIChart*>::iterator iterator =  m_charts.begin();
+         iterator != m_charts.end(); ++iterator)
+        iterator.value()->update();
+    /* Reset the info labels: */
+    resetCPUInfoLabel();
+    resetRAMInfoLabel();
+    resetNetworkInfoLabel();
+    resetDiskIOInfoLabel();
+
+    m_diskWriteCache.clear();
+    m_diskReadCache.clear();
+
+    m_networkReceiveCache.clear();
+    m_networkTransmitCache.clear();
+
+    update();
+    //sltClearCOMData();
+}
+
 void UIVMActivityMonitorCloud::start()
 {
-    obtainDataAndUpdate();
-    /* Every minute: */
-    if (m_pTimer)
-        m_pTimer->start(1000 * 60);
-
+    sltMachineStateUpdateTimeout();
+    if (m_pMachineStateUpdateTimer)
+        m_pMachineStateUpdateTimer->start(1000 * 10);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.h

@@ -326 +326 @@
     void sltMetricNameListingComplete(QVector<QString> metricNameList);
     void sltMetricDataReceived(KMetricType enmMetricType, QVector<QString> data, QVector<QString> timeStamps);
+    void sltMachineStateUpdateTimeout();
 
 private:
@@ -360 +361 @@
 
     CCloudMachine m_comMachine;
-    UIProgressTaskReadCloudMachineMetricList *m_ReadListProgressTask;
+    QPointer<UIProgressTaskReadCloudMachineMetricList> m_ReadListProgressTask;
 
     QVector<KMetricType> m_availableMetricTypes;
@@ -374 +375 @@
     /** Total amount of RAM in kb. */
     quint64 m_iTotalRAM;
+    QTimer *m_pMachineStateUpdateTimer;
+    KCloudMachineState m_enmMachineState;
 };
 #endif /* !FEQT_INCLUDED_SRC_activity_vmactivity_UIVMActivityMonitor_h */