Changeset 6bbdfb for src/Actions/ActionQueue.cpp

Timestamp:

Jan 30, 2015, 1:54:37 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Parents:

419fa2

Message:

tempcommit: Trying to make run_thread relaunchable whenever new Action is queued and not running.

File:

• src/Actions/ActionQueue.cpp (modified) (8 diffs)

src/Actions/ActionQueue.cpp

@@ -67 +67 @@
     lastActionOk(true),
     CurrentAction(0),
-    run_thread_isIdle(true),
-    run_thread_running(false),
-    run_thread(boost::bind(&ActionQueue::run, this))
+    run_thread_isIdle(true)
 #endif
 {
@@ -105 +103 @@
   newaction->prepare(state);
 #ifdef HAVE_ACTION_THREAD
+  {
+    boost::mutex::scoped_lock trylock(mtx_run_thread_running, boost::try_to_lock);
+    if (trylock) {
+      trylock.unlock();
+      run_thread = boost::thread(&ActionQueue::run, this);
+    }
+  }
+
   mtx_actionqueue.lock();
 #endif
@@ -144 +150 @@
 }
 
+void ActionQueue::setActionQueueDone()
+{
+  boost::lock_guard<boost::mutex> lock(mtx_actionqueue);
+  CurrentAction = actionqueue.size();
+}
+
 bool ActionQueue::isTempQueueDone() const
 {
@@ -173 +185 @@
 void ActionQueue::run()
 {
-  {
-    boost::lock_guard<boost::mutex> lock(mtx_run_thread_isIdle);
-    run_thread_running = true;
-  }
+  // only a single thread may run this
+  boost::mutex::scoped_lock trylock(mtx_run_thread_running, boost::try_to_lock);
+  if (trylock) {
   bool Interrupted = false;
   do {
@@ -207 +218 @@
         lastActionOk = false;
         std::cerr << "Remaining Actions cleared from queue." << std::endl;
-      } catch (std::exception &e) {
+      } /* catch (std::exception &e) {
         pushStatus("FAIL: General exception caught, aborting.");
         World::getInstance().setExitFlag(134);
+        lastActionOk = false;
         std::cerr << "Remaining Actions cleared from queue." << std::endl;
-      }
-      // remember action we juse executed
+      }*/
+      // remember action we just executed
       const Action *lastaction = actionqueue[CurrentAction];
-      // step on to next action and check for end
+      // step on to next action if last ok
       if (lastActionOk)
         CurrentAction++;
+
+      mtx_actionqueue.unlock();
+
+      // remove following Actions outside mutex if current failed
+      if (!lastActionOk) {
+        clearQueue(CurrentAction);  // was not incremented
+        clearTempQueue();
+        setActionQueueDone();
+     }
+
       // insert new actions (before [CurrentAction]) if they have been spawned
       // we must have an extra vector for this, as we cannot change actionqueue
       // while an action instance is "in-use"
-      mtx_actionqueue.unlock();
-
-      if (!lastActionOk) {
-        clearQueue(CurrentAction);
-        clearTempQueue();
-      }
 
       insertTempQueue();
 
-      // set last action
+      // set last action when all is done for this Action call
       if (lastActionOk) {
         OBSERVE;
@@ -243 +259 @@
     cond_idle.notify_one();
 //    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;
+  } while ((!Interrupted) && (!isActionQueueDone()));
+  trylock.unlock();
   }
 }
@@ -277 +291 @@
 void ActionQueue::wait()
 {
-  if (run_thread_running) {
+  boost::mutex::scoped_lock trylock(mtx_run_thread_running, boost::try_to_lock);
+  if (!trylock) {
     boost::unique_lock<boost::mutex> lock(mtx_run_thread_isIdle);
     while(!run_thread_isIdle)
@@ -374 +389 @@
     actionqueue.erase(inititer, actionqueue.end());
     LOG(1, "There are " << actionqueue.size() << " remaining Actions.");
-#ifdef HAVE_ACTION_THREAD
-    CurrentAction = actionqueue.size();
-#endif
   }
 }