Changeset 23b6cf for src/Actions/ActionQueue.hpp

Timestamp:

Oct 23, 2014, 4:33:11 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

9a4949

Parents:

7b38d3

git-author:

Frederik Heber <heber@…> (08/29/14 09:46:02)

git-committer:

Frederik Heber <heber@…> (10/23/14 16:33:11)

Message:

THREADFIX: Fixed ActionQueue with respect to mutex and threads.

• run_thread is now last member variable, hence started after all other variables are initialized.
• separated accesses to queues and to run_thread_isIdle flag. Also renamed its mutex for easier association with it.

File:

• src/Actions/ActionQueue.hpp (modified) (1 diff)

src/Actions/ActionQueue.hpp

@@ -265 +265 @@
 
 #ifdef HAVE_ACTION_THREAD
+  //!> internal mutex to synchronize access to queue
+  boost::mutex mtx_queue;
+
+  //!> conditional variable notifying when run_thread is idling
+  boost::condition_variable cond_idle;
+
+  //!> flag indicating whether run_thread is idle or not
+  bool run_thread_isIdle;
+
+  //!> internal mutex to synchronize access to run_thread_isIdle
+  boost::mutex mtx_run_thread_isIdle;
+#endif
+
+  //!> internal list of status messages from Actions for UIs to display
+  ActionStatusList StatusList;
+
+  // set run_thread to end such that others are initialized first (especially mutexes)
+#ifdef HAVE_ACTION_THREAD
   //!> internal thread to call Actions
   boost::thread run_thread;
-
-  //!> internal mutex to synchronize access to queue
-  boost::mutex mtx_queue;
-
-  //!> conditional variable notifying when run_thread is idling
-  boost::condition_variable cond_idle;
-
-  //!> flag indicating whether run_thread is idle or not
-  bool run_thread_isIdle;
-
-  //!> internal mutex to synchronize access to run_thread_isIdle
-  boost::mutex mtx_idle;
-#endif
-
-  //!> internal list of status messages from Actions for UIs to display
-  ActionStatusList StatusList;
+#endif
 };
 namespace Queuedetail {