Changeset 71310 in vbox

Timestamp:

Mar 13, 2018 9:39:12 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:6699 Stop wasting threads for listening terminated guest processes

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl

Files:

• UIGuestControlFileManager.cpp (modified) (1 diff)
• UIGuestControlTreeItem.cpp (modified) (4 diffs)
• UIGuestControlWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManager.cpp

@@ -395 +395 @@
     {
         connect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
-                this, &UIGuestControlFileManager::sltGuestSessionUnregistered, Qt::DirectConnection);
+                this, &UIGuestControlFileManager::sltGuestSessionUnregistered);
     }
     if (m_pSessionCreateWidget)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlTreeItem.cpp

@@ -221 +221 @@
 void UIGuestSessionTreeItem::prepareConnections()
 {
+
+    qRegisterMetaType<CGuestProcess>();
     connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestSessionStatedChanged,
-            this, &UIGuestSessionTreeItem::sltGuestSessionUpdated, Qt::DirectConnection);
+            this, &UIGuestSessionTreeItem::sltGuestSessionUpdated);
     connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestProcessRegistered,
-            this, &UIGuestSessionTreeItem::sltGuestProcessRegistered, Qt::DirectConnection);
+            this, &UIGuestSessionTreeItem::sltGuestProcessRegistered);
     connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestProcessUnregistered,
-            this, &UIGuestSessionTreeItem::sltGuestProcessUnregistered, Qt::DirectConnection);
+            this, &UIGuestSessionTreeItem::sltGuestProcessUnregistered);
 }
 
@@ -275 +277 @@
 void UIGuestSessionTreeItem::addGuestProcess(CGuestProcess guestProcess)
 {
+    /* Dont add the tree items for already terminated or currently being terminated
+       guest processes: */
+    KProcessStatus processStatus = guestProcess.GetStatus();
+    if (processStatus != KProcessStatus_Starting &&
+        processStatus != KProcessStatus_Started &&
+        processStatus != KProcessStatus_Paused)
+        return;
+
     UIGuestProcessTreeItem *newItem = new UIGuestProcessTreeItem(this, guestProcess);
     connect(newItem, &UIGuestProcessTreeItem::sigGuestProcessErrorText,
@@ -329 +339 @@
 void UIGuestProcessTreeItem::prepareConnections()
 {
+    qRegisterMetaType<CGuestProcessStateChangedEvent>();
     connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestProcessStateChanged,
-            this, &UIGuestProcessTreeItem::sltGuestProcessUpdated, Qt::DirectConnection);
+            this, &UIGuestProcessTreeItem::sltGuestProcessUpdated);
 }
 
@@ -359 +370 @@
         CVirtualBoxErrorInfo cErrorInfo = cEvent.GetError();
         if (cErrorInfo.isOk() && cErrorInfo.GetResultCode() != S_OK)
-        {
-            /* For some reason I am yet to find this emit is not working.
-               Thus we are calling the parent's function directly: */
-            //emit sigGuestProcessErrorText(cErrorInfo.GetText());
-            UIGuestSessionTreeItem *sessionParent = dynamic_cast<UIGuestSessionTreeItem*>(QTreeWidgetItem::parent());
-            if (sessionParent)
-            {
-                sessionParent->errorString(cErrorInfo.GetText().toStdString().c_str());
-            }
-        }
+            emit sigGuestProcessErrorText(cErrorInfo.GetText());
+
     }
     setColumnText();
+    KProcessStatus processStatus = m_comGuestProcess.GetStatus();
+    if (processStatus != KProcessStatus_Starting &&
+        processStatus !=  KProcessStatus_Started &&
+        processStatus !=  KProcessStatus_Paused)
+    {
+        this->deleteLater();
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlWidget.cpp

@@ -251 +251 @@
     {
         connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestSessionRegistered,
-                this, &UIGuestControlWidget::sltGuestSessionRegistered, Qt::DirectConnection);
+                this, &UIGuestControlWidget::sltGuestSessionRegistered);
         connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
-                this, &UIGuestControlWidget::sltGuestSessionUnregistered, Qt::DirectConnection);
+                this, &UIGuestControlWidget::sltGuestSessionUnregistered);
     }
 }