From f8b6f2e4a4f6562322377332cc0baea27ce11fc4 Mon Sep 17 00:00:00 2001 From: "Tomoya.Fujita" Date: Tue, 13 Aug 2019 16:34:03 +0900 Subject: [PATCH 1/2] get rid of redundant interation to search node via get_node_by_group. Signed-off-by: Tomoya.Fujita --- rclcpp/src/rclcpp/executor.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/rclcpp/src/rclcpp/executor.cpp b/rclcpp/src/rclcpp/executor.cpp index 2a47b71bbd..2a1fb70f4a 100644 --- a/rclcpp/src/rclcpp/executor.cpp +++ b/rclcpp/src/rclcpp/executor.cpp @@ -540,7 +540,6 @@ Executor::get_next_timer(AnyExecutable & any_exec) if (timer && timer->is_ready()) { any_exec.timer = timer; any_exec.callback_group = group; - node = get_node_by_group(group); return; } } From 146b4fe5b6b3e026fff5ad123894f8a614272b40 Mon Sep 17 00:00:00 2001 From: "Tomoya.Fujita" Date: Wed, 14 Aug 2019 17:15:10 +0900 Subject: [PATCH 2/2] node_base should be updated. Signed-off-by: Tomoya.Fujita --- rclcpp/src/rclcpp/executor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/rclcpp/src/rclcpp/executor.cpp b/rclcpp/src/rclcpp/executor.cpp index 2a1fb70f4a..341b8457d2 100644 --- a/rclcpp/src/rclcpp/executor.cpp +++ b/rclcpp/src/rclcpp/executor.cpp @@ -540,6 +540,7 @@ Executor::get_next_timer(AnyExecutable & any_exec) if (timer && timer->is_ready()) { any_exec.timer = timer; any_exec.callback_group = group; + any_exec.node_base = node; return; } }