Changeset fff8fc for src/Actions/ActionQueue.hpp

Timestamp:

Oct 23, 2014, 4:34:39 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

7e6c0d

Parents:

9a4949

git-author:

Frederik Heber <heber@…> (09/03/14 19:26:17)

git-committer:

Frederik Heber <heber@…> (10/23/14 16:34:39)

Message:

Cleaned up use of mutexes in ActionQueue.

• tempqueue now has its own mutex.
• more often using lock_guard.
• run_thread_isIdle has own mutex.

File:

• src/Actions/ActionQueue.hpp (modified) (3 diffs)

src/Actions/ActionQueue.hpp

@@ -229 +229 @@
   void insertTempQueue();
 
+  /** Helper to check whether there are more actions in actionqueue for
+   * run_thread.
+   *
+   * \return false - more actions, true - CurrentAction is beyond last action.
+   */
+  bool isActionQueueDone() const;
+
+  /** Helper to check whether there are more actions in tempqueue for
+   * run_thread.
+   *
+   * \return false - more actions, true - tempqueue is empty
+   */
+  bool isTempQueueDone() const;
+
+#ifdef HAVE_ACTION_THREAD
+  /** Getter to run_thread_isIdle wrapped in mutex.
+   *
+   * \return true - run_thread is idle, false - it is not
+   */
+  bool getrun_thread_isIdle() const;
+
+  /** Setter for run_thread_isIdle wrapped in mutex.
+   *
+   * \param _run_thread_isIdle new idle status for run_thread
+   */
+  void setrun_thread_isIdle(
+      const bool _run_thread_isIdle);
+#endif
+
 private:
   /** Private cstor for ActionQueue.
@@ -266 +295 @@
 #ifdef HAVE_ACTION_THREAD
   //!> internal mutex to synchronize access to queue
-  boost::mutex mtx_queue;
+  mutable boost::mutex mtx_actionqueue;
+
+  //!> internal mutex to synchronize access to queue
+  mutable boost::mutex mtx_tempqueue;
 
   //!> conditional variable notifying when run_thread is idling
@@ -275 +307 @@
 
   //!> internal mutex to synchronize access to run_thread_isIdle
-  boost::mutex mtx_run_thread_isIdle;
+  mutable boost::mutex mtx_run_thread_isIdle;
 #endif