Changeset 48911 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 7, 2013 12:01:17 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: UIThreadPool: Small after-inspection cleanup.

Location:

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

Files:

• UIThreadPool.cpp (modified) (13 diffs)
• UIThreadPool.h (modified) (2 diffs)

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

@@ -30 +30 @@
 #include <VBox/sup.h>
 
-/** @todo r=bird: this code was racy, inefficient and buggy in it's first
- *        incarnation.  What is required from RTReqPool for it to replace the
- *        internals here?  COM init/term hooks, sure. Does the threads need to
- *        be QThreads? */
-
-
 /**
  * COM capable worker thread for the UIThreadPool.
@@ -55 +49 @@
     int getIndex() const { return m_iIndex; }
 
-    /** Disables sigFinished.  For optimizing pool termination. */
+    /** Disables sigFinished. For optimizing pool termination. */
     void setNoFinishedSignal()
     {
@@ -76 +70 @@
 
 
-UIThreadPool::UIThreadPool(ulong cMaxWorkers/* = 3*/, ulong cMsWorkerIdleTimeout /* = 5000*/)
+UIThreadPool::UIThreadPool(ulong cMaxWorkers /* = 3 */, ulong cMsWorkerIdleTimeout /* = 5000 */)
     : m_workers(cMaxWorkers)
     , m_cMsIdleTimeout(cMsWorkerIdleTimeout)
@@ -82 +76 @@
     , m_cIdleWorkers(0)
     , m_fTerminating(false) /* termination status */
-    , m_everythingLocker(QMutex::NonRecursive)
 {
 }
@@ -91 +84 @@
     setTerminating();
 
+    m_everythingLocker.lock(); /* paranoia */
+
     /* Cleanup all the workers: */
-    m_everythingLocker.lock(); /* paranoia */
     for (int idxWorker = 0; idxWorker < m_workers.size(); ++idxWorker)
     {
@@ -134 +128 @@
     else if (m_cWorkers < m_workers.size())
     {
-        /* Find free slot. */
+        /* Find free slot: */
         int idxFirstUnused = m_workers.size();
         while (idxFirstUnused-- > 0)
@@ -165 +159 @@
 {
     /* Acquire termination-flag: */
-    QMutexLocker lock(&m_everythingLocker);
+    m_everythingLocker.lock();
     bool fTerminating = m_fTerminating;
-    lock.unlock();
+    m_everythingLocker.unlock();
 
     return fTerminating;
@@ -195 +189 @@
 UITask* UIThreadPool::dequeueTask(UIThreadWorker *pWorker)
 {
-    /*
-     * Dequeue a task, watching out for terminations. For opimal efficiency in
-     * enqueueTask() we keep count of idle threads.
-     *
-     * If the wait times out, we'll return NULL and terminate the thread.
-     */
+    /* Dequeue a task, watching out for terminations.
+     * For opimal efficiency in enqueueTask() we keep count of idle threads.
+     * If the wait times out, we'll return NULL and terminate the thread. */
     m_everythingLocker.lock();
 
@@ -219 +210 @@
         }
 
-        /* If we timed out already, then quit the worker thread.  To prevent a
+        /* If we timed out already, then quit the worker thread. To prevent a
            race between enqueueTask and the queue removal of the thread from
-           the workers vector, we remove it here already.  (This does not apply
+           the workers vector, we remove it here already. (This does not apply
            to the termination scenario.) */
         if (fIdleTimedOut)
@@ -254 +245 @@
 {
     /* Wait for the thread to finish completely, then delete the thread
-       object.  We have already removed the thread from the workers vector.
+       object. We have already removed the thread from the workers vector.
        Note! We don't want to use 'this' here, in case it's invalid. */
     pWorker->wait();
@@ -289 +280 @@
 void UIThreadWorker::run()
 {
-//    LogRelFlow(("UIThreadWorker #%d: Started...\n", m_iIndex));
-
     /* Initialize COM: */
     COMBase::InitializeCOM(false);
@@ -297 +286 @@
     while (UITask *pTask = m_pPool->dequeueTask(this))
     {
-        /* Process task: */
-//        LogRelFlow(("UIThreadWorker #%d: Task acquired...\n", m_iIndex));
+        /* Process the task if we are not terminating.
+         * Please take into account tasks are cleared by their creator. */
         if (!m_pPool->isTerminating())
             pTask->start();
-        /** @todo else: Just leak the task? */
-//        LogRelFlow(("UIThreadWorker #%d: Task processed!\n", m_iIndex));
     }
 
@@ -312 +299 @@
     if (!m_fNoFinishedSignal)
         emit sigFinished(this);
-
-//    LogRelFlow(("UIThreadWorker #%d: Finished!\n", m_iIndex));
 }
 

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

@@ -57 +57 @@
 
     /* Protected API: Worker-thread stuff: */
-    UITask *dequeueTask(UIThreadWorker *pWorker);
+    UITask* dequeueTask(UIThreadWorker *pWorker);
 
 private slots:
@@ -68 +68 @@
 
 private:
+
     /** @name Worker thread related variables.
      * @{ */