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

Timestamp:

Apr 22, 2021 2:55:38 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143970

Message:

FE/Qt: bugref:8161: Change application shutdown order; The old approach was to close GUI, then detach COM and do the rest of cleanup; Now we are detaching COM first to let VBoxSVC go, then closing GUI and do the rest of cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (6 diffs)
• UICommon.h (modified) (2 diffs)
• UIStarter.cpp (modified) (4 diffs)
• UIStarter.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -283 +283 @@
     : m_enmType(enmType)
     , m_fValid(false)
+#ifdef VBOX_WS_WIN
+    , m_fDataCommitted(false)
+#endif
 #ifdef VBOX_WS_MAC
     , m_enmMacOSVersion(MacOSXRelease_Old)
@@ -4078 +4081 @@
 {
     /* Make sure QApplication cleanup us on exit: */
-    connect(qApp, &QGuiApplication::aboutToQuit, this, &UICommon::cleanup);
+    connect(qApp, &QGuiApplication::aboutToQuit,
+            this, &UICommon::cleanup);
 #ifndef VBOX_GUI_WITH_CUSTOMIZATIONS1
     /* Make sure we handle host OS session shutdown as well: */
@@ -4570 +4574 @@
 void UICommon::cleanup()
 {
+    LogRel(("GUI: UICommon: Handling aboutToQuit request..\n"));
+
+#ifdef VBOX_WS_WIN
+    /* Ask listeners to commit data if haven't yet: */
+    if (!m_fDataCommitted)
+    {
+        emit sigAskToCommitData();
+        m_fDataCommitted = true;
+    }
+#else
+    /* Ask listeners to commit data: */
+    emit sigAskToCommitData();
+#endif
+
     /// @todo Shouldn't that be protected with a mutex or something?
     /* Remember that the cleanup is in progress preventing any unwanted
@@ -4654 +4672 @@
     m_comCleanupProtectionToken.unlock();
 
+    /* Notify listener it can close UI now: */
+    emit sigAskToCloseUI();
+
     /* Destroy popup-center: */
     UIPopupCenter::destroy();
@@ -4663 +4684 @@
 
     m_fValid = false;
+
+    LogRel(("GUI: UICommon: aboutToQuit request handled!\n"));
 }
 
@@ -4672 +4695 @@
     /* Ask listener to commit data: */
     emit sigAskToCommitData();
+#ifdef VBOX_WS_WIN
+    m_fDataCommitted = true;
+#endif
 
     /* Ask session manager to postpone shutdown until we done: */

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

@@ -81 +81 @@
         /** Asks #UIStarter listener to restart UI. */
         void sigAskToRestartUI();
+        /** Asks #UIStarter listener to close UI. */
+        void sigAskToCloseUI();
 
         /** Notifies listeners about the VBoxSVC availability change. */
@@ -839 +841 @@
         bool  m_fValid;
 
+#ifdef VBOX_WS_WIN
+        /** Holds whether overall GUI data is committed. */
+        bool  m_fDataCommitted;
+#endif
+
 #ifdef VBOX_WS_MAC
         /** Mac OS X: Holds the #MacOSXRelease determined using <i>uname</i> call. */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIStarter.cpp

@@ -61 +61 @@
     /* Assign instance: */
     s_pInstance = this;
-
-    /* Prepare: */
-    prepare();
 }
 
 UIStarter::~UIStarter()
 {
-    /* Cleanup: */
-    cleanup();
-
     /* Unassign instance: */
     s_pInstance = 0;
@@ -80 +74 @@
     connect(&uiCommon(), &UICommon::sigAskToRestartUI,
             this, &UIStarter::sltRestartUI);
+    connect(&uiCommon(), &UICommon::sigAskToCloseUI,
+            this, &UIStarter::sltCloseUI);
     connect(&uiCommon(), &UICommon::sigAskToCommitData,
             this, &UIStarter::sltHandleCommitDataRequest);
@@ -89 +85 @@
     disconnect(&uiCommon(), &UICommon::sigAskToRestartUI,
                this, &UIStarter::sltRestartUI);
+    disconnect(&uiCommon(), &UICommon::sigAskToCloseUI,
+               this, &UIStarter::sltCloseUI);
     disconnect(&uiCommon(), &UICommon::sigAskToCommitData,
                this, &UIStarter::sltHandleCommitDataRequest);
-}
-
-void UIStarter::prepare()
-{
-    /* Listen for QApplication signals: */
-    connect(qApp, &QGuiApplication::aboutToQuit,
-            this, &UIStarter::cleanup);
 }
 
@@ -156 +147 @@
 }
 
-void UIStarter::cleanup()
+void UIStarter::sltCloseUI()
 {
 #ifndef VBOX_RUNTIME_UI

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

@@ -53 +53 @@
 private slots:
 
-    /** Prepares everything. */
-    void prepare();
-
     /** Starts corresponding part of the UI. */
     void sltStartUI();
     /** Restarts corresponding part of the UI. */
     void sltRestartUI();
-
-    /** Cleanups everything. */
-    void cleanup();
+    /** Closes corresponding part of the UI. */
+    void sltCloseUI();
 
     /** Handles commit data request. */