Changeset 41042 in vbox for trunk/src

Timestamp:

Apr 24, 2012 10:39:09 AM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Settings serializer refactoring, fixed bug with settings serializer crushing on ACPI shutdown (#6141).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialogSpecific.cpp (modified) (19 diffs)
• UISettingsDialogSpecific.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -74 +74 @@
     Q_OBJECT;
 
+signals:
+
+    /* Signal to notify main GUI thread about process has been started: */
+    void sigNotifyAboutProcessStarted();
+
+    /* Signal to notify main GUI thread about some page was processed: */
+    void sigNotifyAboutPageProcessed(int iPageId);
+
+    /* Signal to notify main GUI thread about all pages were processed: */
+    void sigNotifyAboutPagesProcessed();
+
 public:
 
@@ -84 +95 @@
         , m_direction(direction)
         , m_data(data)
-        , m_fConditionDone(false)
-        , m_fAllowToDestroySerializer(false)
-        , m_iPageIdWeAreWaitingFor(-1)
+        , m_fSavingComplete(m_direction == UISettingsSerializeDirection_Load)
+        , m_fAllowToDestroySerializer(m_direction == UISettingsSerializeDirection_Load)
         , m_iIdOfHighPriorityPage(-1)
     {
+        /* Set instance: */
+        m_pInstance = this;
+
         /* Connecting this signals: */
         connect(this, SIGNAL(sigNotifyAboutPageProcessed(int)), this, SLOT(sltHandleProcessedPage(int)), Qt::QueuedConnection);
@@ -96 +109 @@
         connect(this, SIGNAL(sigNotifyAboutProcessStarted()), parent(), SLOT(sltHandleProcessStarted()), Qt::QueuedConnection);
         connect(this, SIGNAL(sigNotifyAboutPageProcessed(int)), parent(), SLOT(sltHandlePageProcessed()), Qt::QueuedConnection);
-
-        /* Set instance: */
-        m_pInstance = this;
     }
 
@@ -104 +114 @@
     ~UISettingsSerializer()
     {
-        /* Reset instance: */
-        m_pInstance = 0;
-
         /* If serializer is being destructed by it's parent,
          * thread could still be running, we have to wait
@@ -112 +119 @@
         if (isRunning())
             wait();
+
+        /* Clear instance: */
+        m_pInstance = 0;
     }
 
@@ -124 +134 @@
     }
 
-    /* Blocks calling thread until requested page will be processed: */
-    void waitForPageToBeProcessed(int iPageId)
-    {
-        m_iPageIdWeAreWaitingFor = iPageId;
-        blockGUIthread();
-    }
-
-    /* Blocks calling thread until all pages will be processed: */
-    void waitForPagesToBeProcessed()
-    {
-        m_iPageIdWeAreWaitingFor = -1;
-        blockGUIthread();
-    }
-
     /* Raise priority of page: */
     void raisePriorityOfPage(int iPageId)
@@ -157 +153 @@
     QVariant& data() { return m_data; }
 
-signals:
-
-    /* Signal to notify main GUI thread about process has been started: */
-    void sigNotifyAboutProcessStarted();
-
-    /* Signal to notify main GUI thread about some page was processed: */
-    void sigNotifyAboutPageProcessed(int iPageId);
-
-    /* Signal to notify main GUI thread about all pages were processed: */
-    void sigNotifyAboutPagesProcessed();
-
 public slots:
 
     void start(Priority priority = InheritPriority)
     {
-        /* Notify listeners a bout we are starting: */
+        /* Notify listeners about we are starting: */
         emit sigNotifyAboutProcessStarted();
+
         /* If serializer saves settings: */
         if (m_direction == UISettingsSerializeDirection_Save)
@@ -181 +167 @@
                 m_pages.values()[iPageIndex]->putToCache();
         }
-        /* Start async thread: */
+
+        /* Start async serializing thread: */
         QThread::start(priority);
+
+        /* If serializer saves settings: */
+        if (m_direction == UISettingsSerializeDirection_Save)
+        {
+            /* We should block calling thread until all pages will be saved: */
+            while (!m_fSavingComplete)
+            {
+                /* Lock mutex initially: */
+                m_mutex.lock();
+                /* Perform idle-processing every 100ms,
+                 * and waiting for direct wake up signal: */
+                m_condition.wait(&m_mutex, 100);
+                /* Process queued signals posted to GUI thread: */
+                qApp->processEvents();
+                /* Unlock mutex finally: */
+                m_mutex.unlock();
+            }
+            m_fAllowToDestroySerializer = true;
+        }
     }
 
@@ -197 +203 @@
                 m_pages[iPageId]->getFromCache();
         }
-        /* If thats the page we are waiting for,
-         * we should flag GUI thread to unlock itself: */
-        if (iPageId == m_iPageIdWeAreWaitingFor && !m_fConditionDone)
-            m_fConditionDone = true;
-    }
-
-    /* Slot to handle the fact of some page was processed: */
+    }
+
+    /* Slot to handle the fact of all pages were processed: */
     void sltHandleProcessedPages()
     {
-        /* We should flag GUI thread to unlock itself: */
-        if (!m_fConditionDone)
-            m_fConditionDone = true;
+        /* If serializer saves settings: */
+        if (m_direction == UISettingsSerializeDirection_Save)
+        {
+            /* We should flag GUI thread to unlock itself: */
+            if (!m_fSavingComplete)
+                m_fSavingComplete = true;
+        }
     }
 
@@ -223 +229 @@
 
 protected:
-
-    /* GUI thread locker: */
-    void blockGUIthread()
-    {
-        m_fConditionDone = false;
-        while (!m_fConditionDone)
-        {
-            /* Lock mutex initially: */
-            m_mutex.lock();
-            /* Perform idle-processing every 100ms,
-             * and waiting for direct wake up signal: */
-            m_condition.wait(&m_mutex, 100);
-            /* Process queued signals posted to GUI thread: */
-            qApp->processEvents();
-            /* Unlock mutex finally: */
-            m_mutex.unlock();
-        }
-        m_fAllowToDestroySerializer = true;
-    }
 
     /* Settings processor: */
@@ -275 +262 @@
             /* Notify listeners about page was processed: */
             emit sigNotifyAboutPageProcessed(pPage->id());
-            /* Try to wake up GUI thread, but
-             * it can be busy idle-processing for loaded pages: */
-            if (!m_fConditionDone)
+            /* If serializer saves settings => wake up GUI thread: */
+            if (m_direction == UISettingsSerializeDirection_Save)
                 m_condition.wakeAll();
+            /* Break further processing if page had failed: */
             if (pPage->failed())
                 break;
@@ -284 +271 @@
         /* Notify listeners about all pages were processed: */
         emit sigNotifyAboutPagesProcessed();
-        /* Try to wake up GUI thread, but
-         * it can be busy idle-processing loaded pages: */
-        if (!m_fConditionDone)
+        /* If serializer saves settings => wake up GUI thread: */
+        if (m_direction == UISettingsSerializeDirection_Save)
             m_condition.wakeAll();
     }
@@ -294 +280 @@
     QVariant m_data;
     UISettingsPageMap m_pages;
-    bool m_fConditionDone;
+    bool m_fSavingComplete;
     bool m_fAllowToDestroySerializer;
-    int m_iPageIdWeAreWaitingFor;
     int m_iIdOfHighPriorityPage;
     QMutex m_mutex;
@@ -421 +406 @@
     /* Choose first item by default: */
     m_pSelector->selectById(0);
+}
+
+UISettingsDialogGlobal::~UISettingsDialogGlobal()
+{
+    /* Delete serializer early if exists: */
+    if (UISettingsSerializer::instance())
+        delete UISettingsSerializer::instance();
 }
 
@@ -439 +431 @@
     /* Start loader: */
     pGlobalSettingsLoader->start();
-    /* Wait for just one (first) page to be loaded: */
-    pGlobalSettingsLoader->waitForPageToBeProcessed(m_pSelector->currentId());
 }
 
@@ -461 +451 @@
     /* Start saver: */
     pGlobalSettingsSaver->start();
-    /* Wait for all pages to be saved: */
-    pGlobalSettingsSaver->waitForPagesToBeProcessed();
 
     /* Get updated properties & settings: */
@@ -737 +725 @@
 }
 
+UISettingsDialogMachine::~UISettingsDialogMachine()
+{
+    /* Delete serializer early if exists: */
+    if (UISettingsSerializer::instance())
+        delete UISettingsSerializer::instance();
+}
+
 void UISettingsDialogMachine::loadData()
 {
@@ -774 +769 @@
     /* Start page loader: */
     pMachineSettingsLoader->start();
-    /* Wait for just one (required) page to be loaded: */
-    pMachineSettingsLoader->waitForPageToBeProcessed(m_pSelector->currentId());
 }
 
@@ -812 +805 @@
     /* Start saver: */
     pMachineSettingsSaver->start();
-    /* Wait for all pages to be saved: */
-    pMachineSettingsSaver->waitForPagesToBeProcessed();
 
     /* Get updated machine: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h

@@ -46 +46 @@
 
     UISettingsDialogGlobal(QWidget *pParent);
+    ~UISettingsDialogGlobal();
 
 protected:
@@ -86 +87 @@
     UISettingsDialogMachine(QWidget *pParent, const QString &strMachineId,
                             const QString &strCategory, const QString &strControl);
+    ~UISettingsDialogMachine();
 
 protected: