1- 2- Date: Fri, 20 May 2022 22:39:18 +0000
1+ From: Timon
Engelke <[email protected] >
2+ Date: Thu, 9 Jun 2022 12:09:15 +0200
33Subject: Add EventsExecutor
44
55---
@@ -6545,7 +6545,7 @@ index 803d940..512defb 100644
65456545
65466546 rmw_message_info_t msg_info;
65476547diff --git a/include/rclcpp/parameter_event_handler.hpp b/include/rclcpp/parameter_event_handler.hpp
6548- index c2ee55a..15436cb 100644
6548+ index 52a0233..a7269ce 100644
65496549--- a/include/rclcpp/parameter_event_handler.hpp
65506550+++ b/include/rclcpp/parameter_event_handler.hpp
65516551@@ -52,7 +52,7 @@ struct ParameterEventCallbackHandle
@@ -6566,7 +6566,7 @@ index c2ee55a..15436cb 100644
65666566 callbacks->event_callback(event);
65676567 });
65686568 }
6569- @@ -328 ,7 +328 ,7 @@ protected:
6569+ @@ -329 ,7 +329 ,7 @@ protected:
65706570 /// Callback for parameter events subscriptions.
65716571 RCLCPP_PUBLIC
65726572 void
@@ -6636,7 +6636,7 @@ index f21f27e..6f94f86 100644
66366636 bool use_intra_process_;
66376637 IntraProcessManagerWeakPtr weak_ipm_;
66386638diff --git a/include/rclcpp/timer.hpp b/include/rclcpp/timer.hpp
6639- index d55167e..dc86de9 100644
6639+ index e31c9fe..f0e93c5 100644
66406640--- a/include/rclcpp/timer.hpp
66416641+++ b/include/rclcpp/timer.hpp
66426642@@ -121,6 +121,15 @@ public:
@@ -8018,10 +8018,10 @@ index 8be8364..2f6a37d 100644
80188018 // Create the default callback group.
80198019 using rclcpp::CallbackGroupType;
80208020diff --git a/src/rclcpp/parameter_event_handler.cpp b/src/rclcpp/parameter_event_handler.cpp
8021- index 6ba5266..15964d0 100644
8021+ index b1b36b6..e317574 100644
80228022--- a/src/rclcpp/parameter_event_handler.cpp
80238023+++ b/src/rclcpp/parameter_event_handler.cpp
8024- @@ -158 ,13 +158 ,13 @@ ParameterEventHandler::get_parameters_from_event(
8024+ @@ -162 ,13 +162 ,13 @@ ParameterEventHandler::get_parameters_from_event(
80258025 }
80268026
80278027 void
@@ -8132,7 +8132,7 @@ index 1fa2cbb..4d9f302 100644
81328132 execute(std::shared_ptr<void> & data) override
81338133 {
81348134diff --git a/test/rclcpp/test_parameter_event_handler.cpp b/test/rclcpp/test_parameter_event_handler.cpp
8135- index 9bdd96e..35b8706 100644
8135+ index c80ca2f..84b3ba0 100644
81368136--- a/test/rclcpp/test_parameter_event_handler.cpp
81378137+++ b/test/rclcpp/test_parameter_event_handler.cpp
81388138@@ -27,9 +27,9 @@ public:
@@ -8147,7 +8147,7 @@ index 9bdd96e..35b8706 100644
81478147 }
81488148
81498149 size_t num_event_callbacks()
8150- @@ -264 ,20 +264 ,20 @@ TEST_F(TestNode, EventCallback)
8150+ @@ -272 ,20 +272 ,20 @@ TEST_F(TestNode, EventCallback)
81518151 double product;
81528152 auto cb =
81538153 [&int_param, &double_param, &product, &received,
@@ -8172,7 +8172,7 @@ index 9bdd96e..35b8706 100644
81728172 double_param = p.get_value<double>();
81738173 } catch (...) {
81748174 }
8175- @@ -286 ,12 +286 ,12 @@ TEST_F(TestNode, EventCallback)
8175+ @@ -294 ,12 +294 ,12 @@ TEST_F(TestNode, EventCallback)
81768176 };
81778177
81788178 auto cb2 =
@@ -8188,7 +8188,7 @@ index 9bdd96e..35b8706 100644
81888188 {
81898189 bool_param = p.get_value<bool>();
81908190 }
8191- @@ -405 ,13 +405 ,13 @@ TEST_F(TestNode, LastInFirstCallForParameterEventCallbacks)
8191+ @@ -413 ,13 +413 ,13 @@ TEST_F(TestNode, LastInFirstCallForParameterEventCallbacks)
81928192 // The callbacks will log the current time for comparison purposes. Add a bit of a stall
81938193 // to ensure that the time noted in the back-to-back calls isn't the same
81948194 auto cb1 =
0 commit comments