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

Timestamp:

Nov 14, 2011 1:24:53 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 5947: VM induces a notable CPU load if suspended: LED update timer changed from 50ms to 500ms and disabled for the states corresponding to paused VM.

Location:

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

Files:

• UIMachineWindowNormal.cpp (modified) (5 diffs)
• UIMachineWindowNormal.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -126 +126 @@
 {
     UIMachineWindow::sltMachineStateChanged();
-    updateAppearanceOf(UIVisualElement_VirtualizationStuff);
+    updateAppearanceOf(UIVisualElement_PauseStuff | UIVisualElement_VirtualizationStuff);
 }
 
@@ -193 +193 @@
 void UIMachineWindowNormal::sltUpdateIndicators()
 {
-    CConsole console = session().GetConsole();
-    QIStateIndicator *pStateIndicator = 0;
-
-    pStateIndicator = indicatorsPool()->indicator(UIIndicatorIndex_HardDisks);
-    if (pStateIndicator->state() != KDeviceActivity_Null)
-    {
-        int state = console.GetDeviceActivity(KDeviceType_HardDisk);
-        if (pStateIndicator->state() != state)
-            pStateIndicator->setState(state);
-    }
-    pStateIndicator = indicatorsPool()->indicator(UIIndicatorIndex_OpticalDisks);
-    if (pStateIndicator->state() != KDeviceActivity_Null)
-    {
-        int state = console.GetDeviceActivity(KDeviceType_DVD);
-        if (pStateIndicator->state() != state)
-            pStateIndicator->setState(state);
-    }
-    pStateIndicator = indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks);
-    if (pStateIndicator->state() != KDeviceActivity_Null)
-    {
-        int state = console.GetDeviceActivity(KDeviceType_Floppy);
-        if (pStateIndicator->state() != state)
-            pStateIndicator->setState(state);
-    }
-    pStateIndicator = indicatorsPool()->indicator(UIIndicatorIndex_USBDevices);
-    if (pStateIndicator->state() != KDeviceActivity_Null)
-    {
-        int state = console.GetDeviceActivity(KDeviceType_USB);
-        if (pStateIndicator->state() != state)
-            pStateIndicator->setState(state);
-    }
-    pStateIndicator = indicatorsPool()->indicator(UIIndicatorIndex_NetworkAdapters);
-    if (pStateIndicator->state() != KDeviceActivity_Null)
-    {
-        int state = console.GetDeviceActivity(KDeviceType_Network);
-        if (pStateIndicator->state() != state)
-            pStateIndicator->setState(state);
-    }
-    pStateIndicator = indicatorsPool()->indicator(UIIndicatorIndex_SharedFolders);
-    if (pStateIndicator->state() != KDeviceActivity_Null)
-    {
-        int state = console.GetDeviceActivity(KDeviceType_SharedFolder);
-        if (pStateIndicator->state() != state)
-            pStateIndicator->setState(state);
-    }
+    updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_HardDisks), KDeviceType_HardDisk);
+    updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_OpticalDisks), KDeviceType_DVD);
+    updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks), KDeviceType_Floppy);
+    updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_USBDevices), KDeviceType_USB);
+    updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_NetworkAdapters), KDeviceType_Network);
+    updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_SharedFolders), KDeviceType_SharedFolder);
 }
 
@@ -298 +259 @@
 
     /* Update that machine window: */
+    if (iElement & UIVisualElement_PauseStuff)
+    {
+        if (uisession()->isPaused() && m_pIdleTimer->isActive())
+            m_pIdleTimer->stop();
+        else if (uisession()->isRunning() && !m_pIdleTimer->isActive())
+            m_pIdleTimer->start(500);
+        sltUpdateIndicators();
+    }
     if (iElement & UIVisualElement_HDStuff)
         indicatorsPool()->indicator(UIIndicatorIndex_HardDisks)->updateAppearance();
@@ -482 +451 @@
     m_pIdleTimer = new QTimer(this);
     connect(m_pIdleTimer, SIGNAL(timeout()), this, SLOT(sltUpdateIndicators()));
-    m_pIdleTimer->start(50);
+    m_pIdleTimer->start(500);
 
 #ifdef Q_WS_MAC
@@ -707 +676 @@
 }
 
+void UIMachineWindowNormal::updateIndicatorState(QIStateIndicator *pIndicator, KDeviceType deviceType)
+{
+    /* Do NOT update indicators with NULL state: */
+    if (pIndicator->state() == KDeviceActivity_Null)
+        return;
+
+    /* Paused VM have all indicator states set to IDLE: */
+    bool fPaused = uisession()->isPaused();
+    if (fPaused)
+    {
+        /* If state differs from IDLE => set IDLE one:  */
+        if (pIndicator->state() != KDeviceActivity_Idle)
+            pIndicator->setState(KDeviceActivity_Idle);
+    }
+    else
+    {
+        /* Get current indicator state: */
+        int state = session().GetConsole().GetDeviceActivity(deviceType);
+        /* If state differs => set new one:  */
+        if (pIndicator->state() != state)
+            pIndicator->setState(state);
+    }
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

@@ -27 +27 @@
 #include "QIWithRetranslateUI.h"
 #include "UIMachineWindow.h"
+#include "COMDefs.h"
 
 /* Local forwards */
@@ -104 +105 @@
     void showSimple();
     bool isMaximizedChecked();
+    void updateIndicatorState(QIStateIndicator *pIndicator, KDeviceType deviceType);
 
     /* Indicators pool: */