Changeset 0427d1 for src/Actions/ActionQueue.hpp

Timestamp:

Feb 27, 2024, 10:18:17 PM (20 months ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

399c69

Parents:

d203d1e

git-author:

Frederik Heber <frederik.heber@…> (02/25/24 23:14:04)

git-committer:

Frederik Heber <frederik.heber@…> (02/27/24 22:18:17)

Message:

FIX: ActionQueue no locked on CurrentAction access.

• actionqueue[CurrentAction] without mutex locking.
• getCurrentAction() without mutex locking.
• extracted stepOnToNextAction().
• using recursive_mutex instead of normal to allow nested locks.

File:

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

src/Actions/ActionQueue.hpp

@@ -21 +21 @@
 #ifdef HAVE_ACTION_THREAD
 #include <boost/thread.hpp>
+#include <boost/thread/recursive_mutex.hpp>
 #endif
 #include <vector>
@@ -263 +264 @@
   { return run_thread; }
 
+  /**
+   * Steps on to the next action by incrementing \a CurrentAction.
+   */
+  void stepOnToNextAction();
+
   /** Clears the temporary queue.
    *
@@ -362 +368 @@
 
   //!> internal mutex to synchronize access to queue
-  mutable boost::mutex mtx_queue;
+  mutable boost::recursive_mutex mtx_queue;
 
   //!> conditional variable notifying when run_thread is idling