Changeset 48822 in vbox

Timestamp:

Oct 2, 2013 3:22:41 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: UI thread-pool: Make sure thread survive full timeout if concurrent thread steal his task.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp (modified) (2 diffs)

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

@@ -150 +150 @@
     m_taskLocker.lock();
 
-    /* Try to get task (moving it from queue to processing list): */
+    /* Try to dequeue task: */
     if (!m_tasks.isEmpty())
         pTask = m_tasks.dequeue();
 
-    /* If there is no task currently: */
-    if (!pTask)
+    /* Make sure we have a task or outdated: */
+    bool fOutdated = false;
+    while (!pTask && !fOutdated)
     {
         /* Mark thread as not busy: */
@@ -162 +163 @@
         /* Wait for <m_uIdleTimeout> milli-seconds for the next task,
          * this issue will temporary unlock <m_taskLocker>: */
-        m_taskCondition.wait(&m_taskLocker, m_uIdleTimeout);
+        fOutdated = !m_taskCondition.wait(&m_taskLocker, m_uIdleTimeout);
 
         /* Mark thread as busy again: */
         pWorker->setBusy(true);
 
-        /* Try to get task again (moving it from queue to processing list): */
+        /* Try to dequeue task again: */
         if (!m_tasks.isEmpty())
             pTask = m_tasks.dequeue();
     }
+    Assert(pTask || fOutdated);
 
     /* Unlock task locker: */