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

Timestamp:

Oct 6, 2013 10:34:17 PM (11 years ago)

Author:

vboxsync

Message:

UIThreadPool.cpp: Don't use isTerminating() when owning the mutex, just access the m_fTerminating member directly. This way we can avoid requiring a recursive mutex and get rid of the warning messgae on X11 about not mixing QWaitCondition and recursive mutexes.

File:

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

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

@@ -82 +82 @@
     , m_cIdleWorkers(0)
     , m_fTerminating(false) /* termination status */
-    , m_everythingLocker(QMutex::Recursive)
+    , m_everythingLocker(QMutex::NonRecursive)
 {
 }
@@ -156 +156 @@
 }
 
+/**
+ * Checks if the thread pool is terminating.
+ *
+ * @returns @c true if terminating, @c false if not.
+ * @note    Do NOT call this while owning the thread pool mutex!
+ */
 bool UIThreadPool::isTerminating() const
 {
@@ -198 +204 @@
 
     bool fIdleTimedOut = false;
-    while (!isTerminating())
+    while (!m_fTerminating)
     {
         Assert(m_workers[pWorker->getIndex()] == pWorker); /* paranoia */