Skip to content

Commit df37d31

Browse files
author
Mauro Passerino
committed
Rename set_events_executor_callback->set_listener_callback
1 parent 52afe81 commit df37d31

15 files changed

+73
-74
lines changed

‎rclcpp/include/rclcpp/client.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ class ClientBase
158158

159159
RCLCPP_PUBLIC
160160
void
161-
set_events_executor_callback(
162-
rmw_listener_callback_t executor_callback,
163-
const void * executor_callback_data) const;
161+
set_listener_callback(
162+
rmw_listener_callback_t callback,
163+
const void * user_data) const;
164164

165165
protected:
166166
RCLCPP_DISABLE_COPY(ClientBase)

‎rclcpp/include/rclcpp/executors/events_executor_notify_waitable.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ class EventsExecutorNotifyWaitable final : public EventWaitable
6060

6161
RCLCPP_PUBLIC
6262
void
63-
set_events_executor_callback(
64-
rmw_listener_callback_t executor_callback,
65-
const void * executor_callback_data) const override
63+
set_listener_callback(
64+
rmw_listener_callback_t callback,
65+
const void * user_data) const override
6666
{
6767
for (auto gc : notify_guard_conditions_) {
6868
rcl_ret_t ret = rcl_guard_condition_set_listener_callback(
6969
gc,
70-
executor_callback,
71-
executor_callback_data,
70+
callback,
71+
user_data,
7272
false);
7373

7474
if (RCL_RET_OK != ret) {

‎rclcpp/include/rclcpp/experimental/subscription_intra_process_base.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ class SubscriptionIntraProcessBase : public rclcpp::Waitable
7676

7777
RCLCPP_PUBLIC
7878
void
79-
set_events_executor_callback(
80-
rmw_listener_callback_t executor_callback,
81-
const void * executor_callback_data) const override;
79+
set_listener_callback(
80+
rmw_listener_callback_t callback,
81+
const void * user_data) const override;
8282

8383
protected:
8484
std::recursive_mutex reentrant_mutex_;

‎rclcpp/include/rclcpp/qos_event.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,11 @@ class QOSEventHandlerBase : public Waitable
107107
bool
108108
is_ready(rcl_wait_set_t * wait_set) override;
109109

110-
/// Set EventsExecutor's callback
111110
RCLCPP_PUBLIC
112111
void
113-
set_events_executor_callback(
114-
rmw_listener_callback_t executor_callback,
115-
const void * executor_callback_data) const override;
112+
set_listener_callback(
113+
rmw_listener_callback_t callback,
114+
const void * user_data) const override;
116115

117116
protected:
118117
rcl_event_t event_handle_;

‎rclcpp/include/rclcpp/service.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ class ServiceBase
128128

129129
RCLCPP_PUBLIC
130130
void
131-
set_events_executor_callback(
132-
rmw_listener_callback_t executor_callback,
133-
const void * executor_callback_data) const;
131+
set_listener_callback(
132+
rmw_listener_callback_t callback,
133+
const void * user_data) const;
134134

135135
protected:
136136
RCLCPP_DISABLE_COPY(ServiceBase)

‎rclcpp/include/rclcpp/subscription_base.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,9 @@ class SubscriptionBase : public std::enable_shared_from_this<SubscriptionBase>
271271

272272
RCLCPP_PUBLIC
273273
void
274-
set_events_executor_callback(
275-
rmw_listener_callback_t executor_callback,
276-
const void * executor_callback_data) const;
274+
set_listener_callback(
275+
rmw_listener_callback_t callback,
276+
const void * user_data) const;
277277

278278
protected:
279279
template<typename EventCallbackT>

‎rclcpp/include/rclcpp/waitable.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ class Waitable
211211
RCLCPP_PUBLIC
212212
virtual
213213
void
214-
set_events_executor_callback(
215-
rmw_listener_callback_t executor_callback,
216-
const void * executor_callback_data) const;
214+
set_listener_callback(
215+
rmw_listener_callback_t callback,
216+
const void * user_data) const;
217217

218218
private:
219219
std::atomic<bool> in_use_by_wait_set_{false};

‎rclcpp/src/rclcpp/client.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,16 +200,16 @@ ClientBase::exchange_in_use_by_wait_set_state(bool in_use_state)
200200
}
201201

202202
void
203-
ClientBase::set_events_executor_callback(
204-
rmw_listener_callback_t executor_callback,
205-
const void * executor_callback_data) const
203+
ClientBase::set_listener_callback(
204+
rmw_listener_callback_t callback,
205+
const void * user_data) const
206206
{
207207
rcl_ret_t ret = rcl_client_set_listener_callback(
208208
client_handle_.get(),
209-
executor_callback,
210-
executor_callback_data);
209+
callback,
210+
user_data);
211211

212212
if (RCL_RET_OK != ret) {
213-
throw std::runtime_error("Couldn't set the EventsExecutor's callback to client");
213+
throw std::runtime_error("Couldn't set listener callback to client");
214214
}
215215
}

‎rclcpp/src/rclcpp/executors/events_executor_entities_collector.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ EventsExecutorEntitiesCollector::set_callback_group_entities_callbacks(
238238
if (subscription) {
239239
weak_subscriptions_map_.emplace(subscription.get(), subscription);
240240

241-
subscription->set_events_executor_callback(
241+
subscription->set_listener_callback(
242242
&EventsExecutor::push_event,
243243
get_callback_data(subscription.get(), SUBSCRIPTION_EVENT));
244244
}
@@ -249,7 +249,7 @@ EventsExecutorEntitiesCollector::set_callback_group_entities_callbacks(
249249
if (service) {
250250
weak_services_map_.emplace(service.get(), service);
251251

252-
service->set_events_executor_callback(
252+
service->set_listener_callback(
253253
&EventsExecutor::push_event,
254254
get_callback_data(service.get(), SERVICE_EVENT));
255255
}
@@ -260,7 +260,7 @@ EventsExecutorEntitiesCollector::set_callback_group_entities_callbacks(
260260
if (client) {
261261
weak_clients_map_.emplace(client.get(), client);
262262

263-
client->set_events_executor_callback(
263+
client->set_listener_callback(
264264
&EventsExecutor::push_event,
265265
get_callback_data(client.get(), CLIENT_EVENT));
266266
}
@@ -271,7 +271,7 @@ EventsExecutorEntitiesCollector::set_callback_group_entities_callbacks(
271271
if (waitable) {
272272
weak_waitables_map_.emplace(waitable.get(), waitable);
273273

274-
waitable->set_events_executor_callback(
274+
waitable->set_listener_callback(
275275
&EventsExecutor::push_event,
276276
get_callback_data(waitable.get(), WAITABLE_EVENT));
277277
}
@@ -296,7 +296,7 @@ EventsExecutorEntitiesCollector::unset_callback_group_entities_callbacks(
296296
group->find_subscription_ptrs_if(
297297
[this](const rclcpp::SubscriptionBase::SharedPtr & subscription) {
298298
if (subscription) {
299-
subscription->set_events_executor_callback(nullptr, nullptr);
299+
subscription->set_listener_callback(nullptr, nullptr);
300300
weak_subscriptions_map_.erase(subscription.get());
301301
remove_callback_data(subscription.get(), SUBSCRIPTION_EVENT);
302302
}
@@ -305,7 +305,7 @@ EventsExecutorEntitiesCollector::unset_callback_group_entities_callbacks(
305305
group->find_service_ptrs_if(
306306
[this](const rclcpp::ServiceBase::SharedPtr & service) {
307307
if (service) {
308-
service->set_events_executor_callback(nullptr, nullptr);
308+
service->set_listener_callback(nullptr, nullptr);
309309
weak_services_map_.erase(service.get());
310310
remove_callback_data(service.get(), SERVICE_EVENT);
311311
}
@@ -314,7 +314,7 @@ EventsExecutorEntitiesCollector::unset_callback_group_entities_callbacks(
314314
group->find_client_ptrs_if(
315315
[this](const rclcpp::ClientBase::SharedPtr & client) {
316316
if (client) {
317-
client->set_events_executor_callback(nullptr, nullptr);
317+
client->set_listener_callback(nullptr, nullptr);
318318
weak_clients_map_.erase(client.get());
319319
remove_callback_data(client.get(), CLIENT_EVENT);
320320
}
@@ -323,7 +323,7 @@ EventsExecutorEntitiesCollector::unset_callback_group_entities_callbacks(
323323
group->find_waitable_ptrs_if(
324324
[this](const rclcpp::Waitable::SharedPtr & waitable) {
325325
if (waitable) {
326-
waitable->set_events_executor_callback(nullptr, nullptr);
326+
waitable->set_listener_callback(nullptr, nullptr);
327327
weak_waitables_map_.erase(waitable.get());
328328
remove_callback_data(waitable.get(), WAITABLE_EVENT);
329329
}
@@ -596,7 +596,7 @@ EventsExecutorEntitiesCollector::add_waitable(rclcpp::Waitable::SharedPtr waitab
596596
{
597597
weak_waitables_map_.emplace(waitable.get(), waitable);
598598

599-
waitable->set_events_executor_callback(
599+
waitable->set_listener_callback(
600600
&EventsExecutor::push_event,
601601
get_callback_data(waitable.get(), WAITABLE_EVENT));
602602
}

‎rclcpp/src/rclcpp/qos_event.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@ QOSEventHandlerBase::is_ready(rcl_wait_set_t * wait_set)
6969
}
7070

7171
void
72-
QOSEventHandlerBase::set_events_executor_callback(
73-
rmw_listener_callback_t executor_callback,
74-
const void * executor_callback_data) const
72+
QOSEventHandlerBase::set_listener_callback(
73+
rmw_listener_callback_t callback,
74+
const void * user_data) const
7575
{
7676
rcl_ret_t ret = rcl_event_set_listener_callback(
7777
&event_handle_,
78-
executor_callback,
79-
executor_callback_data,
78+
callback,
79+
user_data,
8080
false /* Discard previous events */);
8181

8282
if (RCL_RET_OK != ret) {
83-
throw std::runtime_error("Couldn't set EventsExecutor's callback in QOSEventHandlerBase");
83+
throw std::runtime_error("Couldn't set listener callback to QOSEventHandlerBase");
8484
}
8585
}
8686

‎rclcpp/src/rclcpp/service.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@ ServiceBase::exchange_in_use_by_wait_set_state(bool in_use_state)
8686
}
8787

8888
void
89-
ServiceBase::set_events_executor_callback(
90-
rmw_listener_callback_t executor_callback,
91-
const void * executor_callback_data) const
89+
ServiceBase::set_listener_callback(
90+
rmw_listener_callback_t callback,
91+
const void * user_data) const
9292
{
9393
rcl_ret_t ret = rcl_service_set_listener_callback(
9494
service_handle_.get(),
95-
executor_callback,
96-
executor_callback_data);
95+
callback,
96+
user_data);
9797

9898
if (RCL_RET_OK != ret) {
99-
throw std::runtime_error("Couldn't set the EventsExecutor's callback to service");
99+
throw std::runtime_error("Couldn't set listener callback to service");
100100
}
101101
}

‎rclcpp/src/rclcpp/subscription_base.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,16 +290,16 @@ SubscriptionBase::exchange_in_use_by_wait_set_state(
290290
}
291291

292292
void
293-
SubscriptionBase::set_events_executor_callback(
294-
rmw_listener_callback_t executor_callback,
295-
const void * executor_callback_data) const
293+
SubscriptionBase::set_listener_callback(
294+
rmw_listener_callback_t callback,
295+
const void * user_data) const
296296
{
297297
rcl_ret_t ret = rcl_subscription_set_listener_callback(
298298
subscription_handle_.get(),
299-
executor_callback,
300-
executor_callback_data);
299+
callback,
300+
user_data);
301301

302302
if (RCL_RET_OK != ret) {
303-
throw std::runtime_error("Couldn't set the EventsExecutor's callback to subscription");
303+
throw std::runtime_error("Couldn't set listener callback to subscription");
304304
}
305305
}

‎rclcpp/src/rclcpp/subscription_intra_process_base.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ SubscriptionIntraProcessBase::get_actual_qos() const
3838
}
3939

4040
void
41-
SubscriptionIntraProcessBase::set_events_executor_callback(
42-
rmw_listener_callback_t executor_callback,
43-
const void * executor_callback_data) const
41+
SubscriptionIntraProcessBase::set_listener_callback(
42+
rmw_listener_callback_t callback,
43+
const void * user_data) const
4444
{
4545
rcl_ret_t ret = rcl_guard_condition_set_listener_callback(
4646
&gc_,
47-
executor_callback,
48-
executor_callback_data,
47+
callback,
48+
user_data,
4949
true /*Use previous events*/);
5050

5151
if (RCL_RET_OK != ret) {
52-
throw std::runtime_error("Couldn't set guard condition callback");
52+
throw std::runtime_error("Couldn't set guard condition listener callback");
5353
}
5454
}

‎rclcpp/src/rclcpp/waitable.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ Waitable::exchange_in_use_by_wait_set_state(bool in_use_state)
6161
}
6262

6363
void
64-
Waitable::set_events_executor_callback(
65-
rmw_listener_callback_t executor_callback,
66-
const void * executor_callback_data) const
64+
Waitable::set_listener_callback(
65+
rmw_listener_callback_t callback,
66+
const void * user_data) const
6767
{
68-
(void)executor_callback;
69-
(void)executor_callback_data;
68+
(void)callback;
69+
(void)user_data;
7070

7171
throw std::runtime_error(
72-
"Custom waitables should override set_events_executor_callback() to use events executor");
72+
"Custom waitables should override set_listener_callback() to use events executor");
7373
}

‎rclcpp/test/rclcpp/executors/test_executors.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -468,14 +468,14 @@ class TestWaitable : public rclcpp::Waitable
468468
}
469469

470470
void
471-
set_events_executor_callback(
472-
rmw_listener_callback_t executor_callback,
473-
const void * executor_callback_data) const override
471+
set_listener_callback(
472+
rmw_listener_callback_t callback,
473+
const void * user_data) const override
474474
{
475475
rcl_ret_t ret = rcl_guard_condition_set_listener_callback(
476476
&gc_,
477-
executor_callback,
478-
executor_callback_data,
477+
callback,
478+
user_data,
479479
true /*Use previous events*/);
480480

481481
if (RCL_RET_OK != ret) {

0 commit comments

Comments
 (0)