Fix hang with timers in MultiThreadedExecutor (#835) (#836) (#869)

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
ros2 · Sep 25, 2019 · 895145c · 895145c
1 parent 3cdb3cb
commit 895145c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp b/rclcpp/src/rclcpp/executors/multi_threaded_executor.cpp
@@ -83,6 +83,11 @@ MultiThreadedExecutor::run(size_t)
       if (any_exec.timer) {
         // Guard against multiple threads getting the same timer.
         if (scheduled_timers_.count(any_exec.timer) != 0) {
+          // Make sure that any_exec's callback group is reset before
+          // the lock is released.
+          if (any_exec.callback_group) {
+            any_exec.callback_group->can_be_taken_from().store(true);
+          }
           continue;
         }
         scheduled_timers_.insert(any_exec.timer);