Changeset 7e6c0d for src/Actions/ActionQueue.hpp

Timestamp:

Jan 30, 2015, 10:34:16 AM (11 years ago)

Author:

Frederik Heber <heber@…>

Children:

419fa2

Parents:

eea0bb (diff), fff8fc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Frederik Heber <heber@…> (01/29/15 07:42:59)

git-committer:

Frederik Heber <heber@…> (01/30/15 10:34:16)

Message:

Merge branch 'ThreadFixes' into Candidate_v1.4.10

Conflicts:

src/Actions/ActionQueue.cpp
src/Actions/ActionQueue.hpp

• many conflicts due to last commit in ThreadFixes. Combined stuff from ThreadFixes and preventing failing actions from clearing queue entirely.

File:

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

src/Actions/ActionQueue.hpp

@@ -215 +215 @@
   void clearTempQueue();
 
-  /** Sets the run_thread_isIdle flag.
-   *
-   * @param _flag state to set to
-   */
-  void setRunThreadIdle(const bool _flag);
-
   /** Runs the ActionQueue.
    *
@@ -255 +249 @@
   void insertAction(Action *_action, enum Action::QueryOptions state);
 
+#ifdef HAVE_ACTION_THREAD
+  /** 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;
+
+  /** 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.
@@ -291 +314 @@
   ActionQueue_t tempqueue;
 
+  //!> internal mutex to synchronize access to 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
+  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
+  mutable 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 flag to tell whether run_thread is still running
+  bool run_thread_running;
+
   //!> 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 {