refactor to remove listener term

Signed-off-by: William Woodall <william@osrfoundation.org>
ros2 · Apr 5, 2021 · adc68d0 · adc68d0
1 parent 8b169a1
commit adc68d0
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 43 deletions.
diff --git a/rmw_fastrtps_cpp/src/rmw_client.cpp b/rmw_fastrtps_cpp/src/rmw_client.cpp
@@ -377,12 +377,12 @@ rmw_destroy_client(rmw_node_t * node, rmw_client_t * client)
 }
 
 rmw_ret_t
-rmw_client_set_listener_callback(
+rmw_client_set_on_new_response_callback(
   rmw_client_t * rmw_client,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data)
 {
-  return rmw_fastrtps_shared_cpp::__rmw_client_set_listener_callback(
+  return rmw_fastrtps_shared_cpp::__rmw_client_set_on_new_response_callback(
     rmw_client,
     callback,
     user_data);

diff --git a/rmw_fastrtps_cpp/src/rmw_event.cpp b/rmw_fastrtps_cpp/src/rmw_event.cpp
@@ -49,12 +49,12 @@ rmw_subscription_event_init(
 }
 
 rmw_ret_t
-rmw_event_set_listener_callback(
+rmw_event_set_callback(
   rmw_event_t * rmw_event,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data)
 {
-  return rmw_fastrtps_shared_cpp::__rmw_event_set_listener_callback(
+  return rmw_fastrtps_shared_cpp::__rmw_event_set_callback(
     rmw_event,
     callback,
     user_data);

diff --git a/rmw_fastrtps_cpp/src/rmw_service.cpp b/rmw_fastrtps_cpp/src/rmw_service.cpp
@@ -383,12 +383,12 @@ rmw_destroy_service(rmw_node_t * node, rmw_service_t * service)
 }
 
 rmw_ret_t
-rmw_service_set_listener_callback(
+rmw_service_set_on_new_request_callback(
   rmw_service_t * rmw_service,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data)
 {
-  return rmw_fastrtps_shared_cpp::__rmw_service_set_listener_callback(
+  return rmw_fastrtps_shared_cpp::__rmw_service_set_on_new_request_callback(
     rmw_service,
     callback,
     user_data);

diff --git a/rmw_fastrtps_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_cpp/src/rmw_subscription.cpp
@@ -169,12 +169,12 @@ rmw_destroy_subscription(rmw_node_t * node, rmw_subscription_t * subscription)
 }
 
 rmw_ret_t
-rmw_subscription_set_listener_callback(
+rmw_subscription_set_on_new_message_callback(
   rmw_subscription_t * rmw_subscription,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data)
 {
-  return rmw_fastrtps_shared_cpp::__rmw_subscription_set_listener_callback(
+  return rmw_fastrtps_shared_cpp::__rmw_subscription_set_on_new_message_callback(
     rmw_subscription,
     callback,
     user_data);

diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_client_info.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_client_info.hpp
@@ -34,7 +34,7 @@
 
 #include "rcpputils/thread_safety_annotations.hpp"
 
-#include "rmw/listener_callback_type.h"
+#include "rmw/event_callback_type.h"
 
 #include "rmw_fastrtps_shared_cpp/TypeSupport.hpp"
 
@@ -180,7 +180,7 @@ class ClientListener : public eprosima::fastrtps::SubscriberListener
   void
   clientSetExecutorCallback(
     const void * user_data,
-    rmw_listener_callback_t callback)
+    rmw_event_callback_t callback)
   {
     std::unique_lock<std::mutex> lock_mutex(listener_callback_mutex_);
 
@@ -218,7 +218,7 @@ class ClientListener : public eprosima::fastrtps::SubscriberListener
   std::condition_variable * conditionVariable_ RCPPUTILS_TSA_GUARDED_BY(internalMutex_);
   std::set<eprosima::fastrtps::rtps::GUID_t> publishers_;
 
-  rmw_listener_callback_t listener_callback_{nullptr};
+  rmw_event_callback_t listener_callback_{nullptr};
   const void * user_data_{nullptr};
   std::mutex listener_callback_mutex_;
   uint64_t unread_count_ = 0;

diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_event_info.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_event_info.hpp
@@ -32,7 +32,7 @@
 #include "fastrtps/publisher/PublisherListener.h"
 
 #include "rmw/event.h"
-#include "rmw/listener_callback_type.h"
+#include "rmw/event_callback_type.h"
 
 #include "rmw_fastrtps_shared_cpp/TypeSupport.hpp"
 
@@ -71,9 +71,9 @@ class EventListenerInterface
   // new event from this listener has ocurred
   virtual void eventSetExecutorCallback(
     const void * user_data,
-    rmw_listener_callback_t callback) = 0;
+    rmw_event_callback_t callback) = 0;
 
-  rmw_listener_callback_t listener_callback_{nullptr};
+  rmw_event_callback_t listener_callback_{nullptr};
   const void * user_data_{nullptr};
   uint64_t unread_events_count_ = 0;
   std::mutex listener_callback_mutex_;

diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_publisher_info.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_publisher_info.hpp
@@ -96,7 +96,7 @@ class PubListener : public EventListenerInterface, public eprosima::fastrtps::Pu
   RMW_FASTRTPS_SHARED_CPP_PUBLIC
   void eventSetExecutorCallback(
     const void * user_data,
-    rmw_listener_callback_t callback) final;
+    rmw_event_callback_t callback) final;
 
   RMW_FASTRTPS_SHARED_CPP_PUBLIC
   bool

diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_service_info.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_service_info.hpp
@@ -33,7 +33,7 @@
 
 #include "rcpputils/thread_safety_annotations.hpp"
 
-#include "rmw/listener_callback_type.h"
+#include "rmw/event_callback_type.h"
 
 #include "rmw_fastrtps_shared_cpp/TypeSupport.hpp"
 #include "rmw_fastrtps_shared_cpp/guid_utils.hpp"
@@ -295,7 +295,7 @@ class ServiceListener : public eprosima::fastrtps::SubscriberListener
   void
   serviceSetExecutorCallback(
     const void * user_data,
-    rmw_listener_callback_t callback)
+    rmw_event_callback_t callback)
   {
     std::unique_lock<std::mutex> lock_mutex(listener_callback_mutex_);
 
@@ -321,7 +321,7 @@ class ServiceListener : public eprosima::fastrtps::SubscriberListener
   std::mutex * conditionMutex_ RCPPUTILS_TSA_GUARDED_BY(internalMutex_);
   std::condition_variable * conditionVariable_ RCPPUTILS_TSA_GUARDED_BY(internalMutex_);
 
-  rmw_listener_callback_t listener_callback_{nullptr};
+  rmw_event_callback_t listener_callback_{nullptr};
   const void * user_data_{nullptr};
   std::mutex listener_callback_mutex_;
   uint64_t unread_count_ = 0;

diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_subscriber_info.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/custom_subscriber_info.hpp
@@ -27,7 +27,7 @@
 #include "rcpputils/thread_safety_annotations.hpp"
 
 #include "rmw/impl/cpp/macros.hpp"
-#include "rmw/listener_callback_type.h"
+#include "rmw/event_callback_type.h"
 
 #include "rmw_fastrtps_shared_cpp/TypeSupport.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_event_info.hpp"
@@ -115,7 +115,7 @@ class SubListener : public EventListenerInterface, public eprosima::fastrtps::Su
   RMW_FASTRTPS_SHARED_CPP_PUBLIC
   void eventSetExecutorCallback(
     const void * user_data,
-    rmw_listener_callback_t callback) final;
+    rmw_event_callback_t callback) final;
 
   RMW_FASTRTPS_SHARED_CPP_PUBLIC
   bool
@@ -171,7 +171,7 @@ class SubListener : public EventListenerInterface, public eprosima::fastrtps::Su
   void
   subcriptionSetExecutorCallback(
     const void * user_data,
-    rmw_listener_callback_t callback)
+    rmw_event_callback_t callback)
   {
     std::unique_lock<std::mutex> lock_mutex(listener_callback_mutex_);
 

diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/rmw_common.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/rmw_common.hpp
@@ -418,30 +418,30 @@ __rmw_subscription_get_network_flow_endpoints(
 
 RMW_FASTRTPS_SHARED_CPP_PUBLIC
 rmw_ret_t
-__rmw_subscription_set_listener_callback(
+__rmw_subscription_set_on_new_message_callback(
   rmw_subscription_t * rmw_subscription,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data);
 
 RMW_FASTRTPS_SHARED_CPP_PUBLIC
 rmw_ret_t
-__rmw_service_set_listener_callback(
+__rmw_service_set_on_new_request_callback(
   rmw_service_t * rmw_service,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data);
 
 RMW_FASTRTPS_SHARED_CPP_PUBLIC
 rmw_ret_t
-__rmw_client_set_listener_callback(
+__rmw_client_set_on_new_response_callback(
   rmw_client_t * rmw_client,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data);
 
 RMW_FASTRTPS_SHARED_CPP_PUBLIC
 rmw_ret_t
-__rmw_event_set_listener_callback(
+__rmw_event_set_callback(
   rmw_event_t * rmw_event,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data);
 
 }  // namespace rmw_fastrtps_shared_cpp

diff --git a/rmw_fastrtps_shared_cpp/src/custom_publisher_info.cpp b/rmw_fastrtps_shared_cpp/src/custom_publisher_info.cpp
@@ -92,7 +92,7 @@ bool PubListener::hasEvent(rmw_event_type_t event_type) const
 
 void PubListener::eventSetExecutorCallback(
   const void * user_data,
-  rmw_listener_callback_t callback)
+  rmw_event_callback_t callback)
 {
   std::unique_lock<std::mutex> lock_mutex(listener_callback_mutex_);
 

diff --git a/rmw_fastrtps_shared_cpp/src/custom_subscriber_info.cpp b/rmw_fastrtps_shared_cpp/src/custom_subscriber_info.cpp
@@ -94,7 +94,7 @@ bool SubListener::hasEvent(rmw_event_type_t event_type) const
 
 void SubListener::eventSetExecutorCallback(
   const void * user_data,
-  rmw_listener_callback_t callback)
+  rmw_event_callback_t callback)
 {
   std::unique_lock<std::mutex> lock_mutex(listener_callback_mutex_);
 

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_client.cpp b/rmw_fastrtps_shared_cpp/src/rmw_client.cpp
@@ -82,9 +82,9 @@ __rmw_destroy_client(
 }
 
 rmw_ret_t
-__rmw_client_set_listener_callback(
+__rmw_client_set_on_new_response_callback(
   rmw_client_t * rmw_client,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data)
 {
   auto custom_client_info = static_cast<CustomClientInfo *>(rmw_client->data);

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_event.cpp b/rmw_fastrtps_shared_cpp/src/rmw_event.cpp
@@ -69,9 +69,9 @@ __rmw_init_event(
 }
 
 rmw_ret_t
-__rmw_event_set_listener_callback(
+__rmw_event_set_callback(
   rmw_event_t * rmw_event,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data)
 {
   auto custom_event_info = static_cast<CustomEventInfo *>(rmw_event->data);

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_service.cpp b/rmw_fastrtps_shared_cpp/src/rmw_service.cpp
@@ -95,9 +95,9 @@ __rmw_destroy_service(
 }
 
 rmw_ret_t
-__rmw_service_set_listener_callback(
+__rmw_service_set_on_new_request_callback(
   rmw_service_t * rmw_service,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data)
 {
   auto custom_service_info = static_cast<CustomServiceInfo *>(rmw_service->data);

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_shared_cpp/src/rmw_subscription.cpp
@@ -108,9 +108,9 @@ __rmw_subscription_get_actual_qos(
 }
 
 rmw_ret_t
-__rmw_subscription_set_listener_callback(
+__rmw_subscription_set_on_new_message_callback(
   rmw_subscription_t * rmw_subscription,
-  rmw_listener_callback_t callback,
+  rmw_event_callback_t callback,
   const void * user_data)
 {
   auto custom_subscriber_info = static_cast<CustomSubscriberInfo *>(rmw_subscription->data);