Changes in src/Actions/ActionQueue.cpp [601ef8:cfb9c5]

File:

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

src/Actions/ActionQueue.cpp

@@ -44 +44 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/version.hpp>
-#include <iterator>
 #include <string>
 #include <sstream>
@@ -62 +61 @@
     AR(new ActionRegistry()),
     history(new ActionHistory),
+    CurrentAction(0),
 #ifndef HAVE_ACTION_THREAD
     lastActionOk(true)
 #else
-    CurrentAction(0),
     lastActionOk(true),
     run_thread(boost::bind(&ActionQueue::run, this)),
@@ -83 +82 @@
 #ifdef HAVE_ACTION_THREAD
   stop();
-
-  clearTempQueue();
 #endif
 
@@ -114 +111 @@
     std::cerr << "Action " << *boost::get_error_info<ActionNameString>(e) << " has failed." << std::endl;
     World::getInstance().setExitFlag(5);
-    clearQueue(actionqueue.size()-1);
+    clearQueue();
     lastActionOk = false;
-    std::cerr << "Remaining Actions cleared from queue." << std::endl;
+    std::cerr << "ActionQueue cleared." << std::endl;
   } catch (std::exception &e) {
     pushStatus("FAIL: General exception caught, aborting.");
     World::getInstance().setExitFlag(134);
-    clearQueue(actionqueue.size()-1);
+    clearQueue();
     lastActionOk = false;
-    std::cerr << "Remaining Actions cleared from queue." << std::endl;
+    std::cerr << "ActionQueue cleared." << std::endl;
   }
   if (lastActionOk) {
@@ -130 +127 @@
   }
 #else
-  setRunThreadIdle(CurrentAction == actionqueue.size());
+  {
+    boost::lock_guard<boost::mutex> lock(mtx_idle);
+    run_thread_isIdle = (CurrentAction == actionqueue.size());
+  }
   mtx_queue.unlock();
 #endif
@@ -144 +144 @@
   mtx_queue.lock();
   tempqueue.push_back( newaction );
-  setRunThreadIdle( !((CurrentAction != actionqueue.size()) || !tempqueue.empty()) );
+  {
+    boost::lock_guard<boost::mutex> lock(mtx_idle);
+    run_thread_isIdle = !((CurrentAction != actionqueue.size()) || !tempqueue.empty());
+  }
   mtx_queue.unlock();
 #endif
@@ -181 +184 @@
         pushStatus("FAIL: Action "+*boost::get_error_info<ActionNameString>(e)+" has failed.");
         World::getInstance().setExitFlag(5);
-        clearQueue(CurrentAction);
-        clearTempQueue();
+        clearQueue();
         lastActionOk = false;
-        std::cerr << "Remaining Actions cleared from queue." << std::endl;
+        std::cerr << "ActionQueue cleared." << std::endl;
+        CurrentAction = (size_t)-1;
       } catch (std::exception &e) {
         pushStatus("FAIL: General exception caught, aborting.");
         World::getInstance().setExitFlag(134);
-        clearQueue(CurrentAction);
-        clearTempQueue();
-        std::cerr << "Remaining Actions cleared from queue." << std::endl;
+        clearQueue();
+        std::cerr << "ActionQueue cleared." << std::endl;
+        CurrentAction = (size_t)-1;
       }
       if (lastActionOk) {
@@ -196 +199 @@
         NOTIFY(ActionQueued);
         _lastchangedaction = actionqueue[CurrentAction];
-        mtx_queue.lock();
-        CurrentAction++;
-        mtx_queue.unlock();
       }
       // access actionqueue, hence using mutex
       mtx_queue.lock();
+      // step on to next action and check for end
+      CurrentAction++;
       // insert new actions (before [CurrentAction]) if they have been spawned
       // we must have an extra vector for this, as we cannot change actionqueue
@@ -209 +211 @@
       mtx_queue.unlock();
     }
-    setRunThreadIdle( !((CurrentAction != actionqueue.size()) || !tempqueue.empty()) );
+    {
+      boost::lock_guard<boost::mutex> lock(mtx_idle);
+      run_thread_isIdle = !((CurrentAction != actionqueue.size()) || !tempqueue.empty());
+    }
     cond_idle.notify_one();
 //    LOG(1, "DEBUG: End of ActionQueue's run() loop.");
   } while (!Interrupted);
 }
+#endif
 
 void ActionQueue::insertTempQueue()
@@ -225 +231 @@
 }
 
+#ifdef HAVE_ACTION_THREAD
 void ActionQueue::wait()
 {
@@ -309 +316 @@
 }
 
-void ActionQueue::clearQueue(const size_t _fromAction)
-{
-#ifdef HAVE_ACTION_THREAD
-  mtx_queue.lock();
-#endif
-  LOG(1, "Removing all Actions from position " << _fromAction << " onward.");
-  // free all actions still to be called contained in actionqueue
-  ActionQueue_t::iterator inititer = actionqueue.begin();
-  std::advance(inititer, _fromAction);
-  for (ActionQueue_t::iterator iter = inititer; iter != actionqueue.end(); ++iter)
+void ActionQueue::clearQueue()
+{
+  // free all actions contained in actionqueue
+  for (ActionQueue_t::iterator iter = actionqueue.begin();
+      !actionqueue.empty(); iter = actionqueue.begin()) {
     delete *iter;
-  actionqueue.erase(inititer, actionqueue.end());
-  LOG(1, "There are " << actionqueue.size() << " remaining Actions.");
-#ifdef HAVE_ACTION_THREAD
-  CurrentAction = actionqueue.size();
-  mtx_queue.unlock();
-#endif
-}
-
-#ifdef HAVE_ACTION_THREAD
-void ActionQueue::clearTempQueue()
-{
+    actionqueue.erase(iter);
+  }
   // free all actions contained in tempqueue
   for (ActionQueue_t::iterator iter = tempqueue.begin();
@@ -337 +330 @@
     tempqueue.erase(iter);
   }
-}
-
-void ActionQueue::setRunThreadIdle(const bool _flag)
-{
+#ifdef HAVE_ACTION_THREAD
   {
     boost::unique_lock<boost::mutex> lock(mtx_idle);
-    run_thread_isIdle = _flag;
-  }
-}
-#endif
+    run_thread_isIdle = true;
+  }
+#endif
+}
 
 const ActionQueue::ActionTokens_t ActionQueue::getListOfActions() const
@@ -365 +355 @@
 }
 
-bool ActionQueue::canUndo() const
-{
-  return history->hasUndo();
-}
-
 void ActionQueue::redoLast()
 {
@@ -375 +360 @@
 }
 
-bool ActionQueue::canRedo() const
-{
-  return history->hasRedo();
-}
-
 
 CONSTRUCT_SINGLETON(ActionQueue)