Revert. set_listener_callback->set_events_executor_callback

Mauro Passerino · Mauro Passerino · commit 0a5f3f27bc35 · 2020-11-20T17:25:17.000Z
diff --git a/rclcpp/include/rclcpp/client.hpp b/rclcpp/include/rclcpp/client.hpp
@@ -158,7 +158,7 @@ class ClientBase
 
   RCLCPP_PUBLIC
   void
-  set_listener_callback(
+  set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
     rmw_listener_cb_t executor_callback) const;
 
diff --git a/rclcpp/include/rclcpp/executors/events_executor.hpp b/rclcpp/include/rclcpp/executors/events_executor.hpp
@@ -209,7 +209,7 @@ class EventsExecutor : public rclcpp::Executor
     // We need to unset the callbacks to make sure that after removing events from the
     // queues, this entity will not push anymore before being completely destroyed.
     // This assumes that all supported entities implement this function.
-    entity->set_listener_callback(nullptr, nullptr);
+    entity->set_events_executor_callback(nullptr, nullptr);
 
     // Remove events associated with this entity from the event queue
     {
diff --git a/rclcpp/include/rclcpp/executors/events_executor_notify_waitable.hpp b/rclcpp/include/rclcpp/executors/events_executor_notify_waitable.hpp
@@ -62,7 +62,7 @@ class EventsExecutorNotifyWaitable final : public EventWaitable
 
   RCLCPP_PUBLIC
   void
-  set_listener_callback(
+  set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
     rmw_listener_cb_t executor_callback) const override
   {
diff --git a/rclcpp/include/rclcpp/experimental/subscription_intra_process_base.hpp b/rclcpp/include/rclcpp/experimental/subscription_intra_process_base.hpp
@@ -72,7 +72,7 @@ class SubscriptionIntraProcessBase : public rclcpp::Waitable
 
   RCLCPP_PUBLIC
   void
-  set_listener_callback(
+  set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
     rmw_listener_cb_t executor_callback) const override;
 
diff --git a/rclcpp/include/rclcpp/qos_event.hpp b/rclcpp/include/rclcpp/qos_event.hpp
@@ -108,7 +108,7 @@ class QOSEventHandlerBase : public Waitable
   /// Set EventsExecutor's callback
   RCLCPP_PUBLIC
   void
-  set_listener_callback(
+  set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
     rmw_listener_cb_t executor_callback) const override;
 
diff --git a/rclcpp/include/rclcpp/service.hpp b/rclcpp/include/rclcpp/service.hpp
@@ -128,7 +128,7 @@ class ServiceBase
 
   RCLCPP_PUBLIC
   void
-  set_listener_callback(
+  set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
     rmw_listener_cb_t executor_callback) const;
 
diff --git a/rclcpp/include/rclcpp/subscription_base.hpp b/rclcpp/include/rclcpp/subscription_base.hpp
@@ -271,7 +271,7 @@ class SubscriptionBase : public std::enable_shared_from_this<SubscriptionBase>
 
   RCLCPP_PUBLIC
   void
-  set_listener_callback(
+  set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
     rmw_listener_cb_t executor_callback) const;
 
diff --git a/rclcpp/include/rclcpp/waitable.hpp b/rclcpp/include/rclcpp/waitable.hpp
@@ -174,7 +174,7 @@ class Waitable
   RCLCPP_PUBLIC
   virtual
   void
-  set_listener_callback(
+  set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
     rmw_listener_cb_t executor_callback) const;
 
diff --git a/rclcpp/src/rclcpp/client.cpp b/rclcpp/src/rclcpp/client.cpp
@@ -203,7 +203,7 @@ ClientBase::exchange_in_use_by_wait_set_state(bool in_use_state)
 }
 
 void
-ClientBase::set_listener_callback(
+ClientBase::set_events_executor_callback(
   const rclcpp::executors::EventsExecutor * executor,
   rmw_listener_cb_t executor_callback) const
 {
diff --git a/rclcpp/src/rclcpp/executors/events_executor.cpp b/rclcpp/src/rclcpp/executors/events_executor.cpp
@@ -40,7 +40,7 @@ EventsExecutor::EventsExecutor(
   executor_notifier_ = std::make_shared<EventsExecutorNotifyWaitable>();
   executor_notifier_->add_guard_condition(context_interrupt_gc);
   executor_notifier_->add_guard_condition(&interrupt_guard_condition_);
-  executor_notifier_->set_listener_callback(this, &EventsExecutor::push_event);
+  executor_notifier_->set_events_executor_callback(this, &EventsExecutor::push_event);
   executor_notifier_->set_on_destruction_callback(
     std::bind(
       &EventsExecutor::remove_entity<rclcpp::Waitable>,
diff --git a/rclcpp/src/rclcpp/executors/events_executor_entities_collector.cpp b/rclcpp/src/rclcpp/executors/events_executor_entities_collector.cpp
@@ -224,7 +224,7 @@ EventsExecutorEntitiesCollector::set_callback_group_entities_callbacks(
   group->find_subscription_ptrs_if(
     [this](const rclcpp::SubscriptionBase::SharedPtr & subscription) {
       if (subscription) {
-        subscription->set_listener_callback(
+        subscription->set_events_executor_callback(
           associated_executor_,
           &EventsExecutor::push_event);
         subscription->set_on_destruction_callback(
@@ -238,7 +238,7 @@ EventsExecutorEntitiesCollector::set_callback_group_entities_callbacks(
   group->find_service_ptrs_if(
     [this](const rclcpp::ServiceBase::SharedPtr & service) {
       if (service) {
-        service->set_listener_callback(
+        service->set_events_executor_callback(
           associated_executor_,
           &EventsExecutor::push_event);
         service->set_on_destruction_callback(
@@ -252,7 +252,7 @@ EventsExecutorEntitiesCollector::set_callback_group_entities_callbacks(
   group->find_client_ptrs_if(
     [this](const rclcpp::ClientBase::SharedPtr & client) {
       if (client) {
-        client->set_listener_callback(
+        client->set_events_executor_callback(
           associated_executor_,
           &EventsExecutor::push_event);
         client->set_on_destruction_callback(
@@ -266,7 +266,7 @@ EventsExecutorEntitiesCollector::set_callback_group_entities_callbacks(
   group->find_waitable_ptrs_if(
     [this](const rclcpp::Waitable::SharedPtr & waitable) {
       if (waitable) {
-        waitable->set_listener_callback(
+        waitable->set_events_executor_callback(
           associated_executor_,
           &EventsExecutor::push_event);
         waitable->set_on_destruction_callback(
@@ -297,31 +297,31 @@ EventsExecutorEntitiesCollector::unset_callback_group_entities_callbacks(
   group->find_subscription_ptrs_if(
     [this](const rclcpp::SubscriptionBase::SharedPtr & subscription) {
       if (subscription) {
-        subscription->set_listener_callback(nullptr, nullptr);
+        subscription->set_events_executor_callback(nullptr, nullptr);
         subscription->set_on_destruction_callback(nullptr);
       }
       return false;
     });
   group->find_service_ptrs_if(
     [this](const rclcpp::ServiceBase::SharedPtr & service) {
       if (service) {
-        service->set_listener_callback(nullptr, nullptr);
+        service->set_events_executor_callback(nullptr, nullptr);
         service->set_on_destruction_callback(nullptr);
       }
       return false;
     });
   group->find_client_ptrs_if(
     [this](const rclcpp::ClientBase::SharedPtr & client) {
       if (client) {
-        client->set_listener_callback(nullptr, nullptr);
+        client->set_events_executor_callback(nullptr, nullptr);
         client->set_on_destruction_callback(nullptr);
       }
       return false;
     });
   group->find_waitable_ptrs_if(
     [this](const rclcpp::Waitable::SharedPtr & waitable) {
       if (waitable) {
-        waitable->set_listener_callback(nullptr, nullptr);
+        waitable->set_events_executor_callback(nullptr, nullptr);
         waitable->set_on_destruction_callback(nullptr);
       }
       return false;
diff --git a/rclcpp/src/rclcpp/qos_event.cpp b/rclcpp/src/rclcpp/qos_event.cpp
@@ -73,7 +73,7 @@ QOSEventHandlerBase::is_ready(rcl_wait_set_t * wait_set)
 }
 
 void
-QOSEventHandlerBase::set_listener_callback(
+QOSEventHandlerBase::set_events_executor_callback(
   const rclcpp::executors::EventsExecutor * executor,
   rmw_listener_cb_t executor_callback) const
 {
diff --git a/rclcpp/src/rclcpp/service.cpp b/rclcpp/src/rclcpp/service.cpp
@@ -90,7 +90,7 @@ ServiceBase::exchange_in_use_by_wait_set_state(bool in_use_state)
 }
 
 void
-ServiceBase::set_listener_callback(
+ServiceBase::set_events_executor_callback(
   const rclcpp::executors::EventsExecutor * executor,
   rmw_listener_cb_t executor_callback) const
 {
diff --git a/rclcpp/src/rclcpp/subscription_base.cpp b/rclcpp/src/rclcpp/subscription_base.cpp
@@ -294,7 +294,7 @@ SubscriptionBase::exchange_in_use_by_wait_set_state(
 }
 
 void
-SubscriptionBase::set_listener_callback(
+SubscriptionBase::set_events_executor_callback(
   const rclcpp::executors::EventsExecutor * executor,
   rmw_listener_cb_t executor_callback) const
 {
diff --git a/rclcpp/src/rclcpp/subscription_intra_process_base.cpp b/rclcpp/src/rclcpp/subscription_intra_process_base.cpp
@@ -45,7 +45,7 @@ SubscriptionIntraProcessBase::get_actual_qos() const
 }
 
 void
-SubscriptionIntraProcessBase::set_listener_callback(
+SubscriptionIntraProcessBase::set_events_executor_callback(
   const rclcpp::executors::EventsExecutor * executor,
   rmw_listener_cb_t executor_callback) const
 {
diff --git a/rclcpp/src/rclcpp/waitable.cpp b/rclcpp/src/rclcpp/waitable.cpp
@@ -61,15 +61,15 @@ Waitable::exchange_in_use_by_wait_set_state(bool in_use_state)
 }
 
 void
-Waitable::set_listener_callback(
+Waitable::set_events_executor_callback(
   const rclcpp::executors::EventsExecutor * executor,
   rmw_listener_cb_t executor_callback) const
 {
   (void)executor;
   (void)executor_callback;
 
   throw std::runtime_error(
-          "Custom waitables should override set_listener_callback() to use events executor");
+          "Custom waitables should override set_events_executor_callback() to use events executor");
 }
 
 void
diff --git a/rclcpp/test/rclcpp/executors/test_executors.cpp b/rclcpp/test/rclcpp/executors/test_executors.cpp
@@ -465,7 +465,7 @@ class TestWaitable : public rclcpp::Waitable
   }
 
   void
-  set_listener_callback(
+  set_events_executor_callback(
     const rclcpp::executors::EventsExecutor * executor,
     rmw_listener_cb_t executor_callback) const override
   {

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ class EventsExecutor : public rclcpp::Executor`
`209`	`209`	`// We need to unset the callbacks to make sure that after removing events from the`
`210`	`210`	`// queues, this entity will not push anymore before being completely destroyed.`
`211`	`211`	`// This assumes that all supported entities implement this function.`
`212`		`- entity->set_listener_callback(nullptr, nullptr);`
	`212`	`+ entity->set_events_executor_callback(nullptr, nullptr);`
`213`	`213`
`214`	`214`	`// Remove events associated with this entity from the event queue`
`215`	`215`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class EventsExecutorNotifyWaitable final : public EventWaitable`
`62`	`62`
`63`	`63`	`RCLCPP_PUBLIC`
`64`	`64`	`void`
`65`		`- set_listener_callback(`
	`65`	`+ set_events_executor_callback(`
`66`	`66`	`const rclcpp::executors::EventsExecutor * executor,`
`67`	`67`	`rmw_listener_cb_t executor_callback) const override`
`68`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ ClientBase::exchange_in_use_by_wait_set_state(bool in_use_state)`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`void`
`206`		`-ClientBase::set_listener_callback(`
	`206`	`+ClientBase::set_events_executor_callback(`
`207`	`207`	`const rclcpp::executors::EventsExecutor * executor,`
`208`	`208`	`rmw_listener_cb_t executor_callback) const`
`209`	`209`	`{`