Changeset 23b6cf for src/Actions

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.

Location:

src/Actions

Files:

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

src/Actions/ActionQueue.cpp

@@ -66 +66 @@
 #else
     lastActionOk(true),
-    run_thread(boost::bind(&ActionQueue::run, this)),
-    run_thread_isIdle(true)
+    run_thread_isIdle(true),
+    run_thread(boost::bind(&ActionQueue::run, this))
 #endif
 {
@@ -127 +127 @@
   }
 #else
+  const bool new_run_thread_isIdle = (CurrentAction == actionqueue.size());
+  mtx_queue.unlock();
   {
-    boost::lock_guard<boost::mutex> lock(mtx_idle);
-    run_thread_isIdle = (CurrentAction == actionqueue.size());
-  }
-  mtx_queue.unlock();
+    boost::lock_guard<boost::mutex> lock(mtx_run_thread_isIdle);
+    run_thread_isIdle = new_run_thread_isIdle;
+  }
 #endif
 }
@@ -145 +146 @@
   tempqueue.push_back( newaction );
   {
-    boost::lock_guard<boost::mutex> lock(mtx_idle);
+    boost::lock_guard<boost::mutex> lock(mtx_run_thread_isIdle);
     run_thread_isIdle = !((CurrentAction != actionqueue.size()) || !tempqueue.empty());
   }
@@ -160 +161 @@
     try {
 #if BOOST_VERSION < 105000
-      run_thread.sleep(boost::get_system_time() + boost::posix_time::milliseconds(100));
+      boost::this_thread::sleep(boost::get_system_time() + boost::posix_time::milliseconds(100));
 #else
       boost::this_thread::sleep_for(boost::chrono::milliseconds(100));
@@ -176 +177 @@
     while (status) {
       //      boost::this_thread::disable_interruption di;
+      // access actionqueue, hence using mutex
+      mtx_queue.lock();
       LOG(0, "Calling Action " << actionqueue[CurrentAction]->getName() << " ... ");
       try {
@@ -195 +198 @@
         CurrentAction = (size_t)-1;
       }
-      if (lastActionOk) {
-        OBSERVE;
-        NOTIFY(ActionQueued);
-        _lastchangedaction = actionqueue[CurrentAction];
-      }
-      // access actionqueue, hence using mutex
-      mtx_queue.lock();
+      // remember action we juse executed
+      const Action *lastaction = actionqueue[CurrentAction];
       // step on to next action and check for end
       CurrentAction++;
@@ -209 +207 @@
       insertTempQueue();
       status = (CurrentAction != actionqueue.size());
-      mtx_queue.unlock();
+      // set last action
+      if (lastActionOk) {
+        OBSERVE;
+        NOTIFY(ActionQueued);
+        _lastchangedaction = lastaction;
+        // unlock before we delve into Observer functions ...
+        mtx_queue.unlock();
+      } else {
+        mtx_queue.unlock();
+      }
     }
+    mtx_queue.lock();
+    const bool new_run_thread_isIdle = !((CurrentAction != actionqueue.size()) || !tempqueue.empty());
+    mtx_queue.unlock();
     {
-      boost::lock_guard<boost::mutex> lock(mtx_idle);
-      run_thread_isIdle = !((CurrentAction != actionqueue.size()) || !tempqueue.empty());
+      boost::lock_guard<boost::mutex> lock(mtx_run_thread_isIdle);
+      run_thread_isIdle = new_run_thread_isIdle;
     }
     cond_idle.notify_one();
@@ -234 +244 @@
 void ActionQueue::wait()
 {
-  boost::unique_lock<boost::mutex> lock(mtx_idle);
+  boost::unique_lock<boost::mutex> lock(mtx_run_thread_isIdle);
   while(!run_thread_isIdle)
   {

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 {