Changeset 9a4949

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

fff8fc

Parents:

23b6cf

git-author:

Frederik Heber <heber@…> (09/03/14 17:21:08)

git-committer:

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

Message:

Added extra flag run_thread_running to ActionQueue.

• helgrind admonished race conditions when thread is joined. This did not fix them but should be safer as we cannot know whether the other thread has already been started when suddenly shutting down molecuilder due to an exception.

Location:

src/Actions

Files:

• ActionQueue.cpp (modified) (5 diffs)
• ActionQueue.hpp (modified) (1 diff)

src/Actions/ActionQueue.cpp

@@ -67 +67 @@
     lastActionOk(true),
     run_thread_isIdle(true),
+    run_thread_running(false),
     run_thread(boost::bind(&ActionQueue::run, this))
 #endif
@@ -156 +157 @@
 void ActionQueue::run()
 {
+  {
+    boost::lock_guard<boost::mutex> lock(mtx_run_thread_isIdle);
+    run_thread_running = true;
+  }
   bool Interrupted = false;
   do {
@@ -175 +180 @@
     bool status = (CurrentAction != actionqueue.size());
     mtx_queue.unlock();
-    while (status) {
+    while ((status) && (!Interrupted)) {
       //      boost::this_thread::disable_interruption di;
       // access actionqueue, hence using mutex
@@ -228 +233 @@
 //    LOG(1, "DEBUG: End of ActionQueue's run() loop.");
   } while (!Interrupted);
+  {
+    boost::lock_guard<boost::mutex> lock(mtx_run_thread_isIdle);
+    run_thread_running = false;
+  }
 }
 #endif
@@ -245 +254 @@
 {
   boost::unique_lock<boost::mutex> lock(mtx_run_thread_isIdle);
-  while(!run_thread_isIdle)
-  {
-      cond_idle.wait(lock);
-  }
+  if (run_thread_running)
+    while(!run_thread_isIdle)
+    {
+        cond_idle.wait(lock);
+    }
 }
 #endif

src/Actions/ActionQueue.hpp

@@ -283 +283 @@
   // set run_thread to end such that others are initialized first (especially mutexes)
 #ifdef HAVE_ACTION_THREAD
+  //!> internal flag to tell whether run_thread is still running
+  bool run_thread_running;
+
   //!> internal thread to call Actions
   boost::thread run_thread;