Skip to content

Commit 9207d19

Browse files
Added rmw_event_type_is_supported (#173) (#175)
Signed-off-by: Alejandro Hernandez Cordero <[email protected]> (cherry picked from commit 2f3dbef) Co-authored-by: Alejandro Hernández Cordero <[email protected]>
1 parent d7c872f commit 9207d19

File tree

4 files changed

+28
-11
lines changed

4 files changed

+28
-11
lines changed

rmw_connextdds/src/rmw_api_impl_ndds.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,13 @@ rmw_event_set_callback(
138138
{
139139
return rmw_api_connextdds_event_set_callback(event, callback, user_data);
140140
}
141+
142+
bool
143+
rmw_event_type_is_supported(rmw_event_type_t rmw_event_type)
144+
{
145+
return rmw_api_connextdds_event_type_is_supported(rmw_event_type);
146+
}
147+
141148
/*****************************************************************************
142149
* Info API
143150
*****************************************************************************/

rmw_connextdds_common/include/rmw_connextdds/rmw_api_impl.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ rmw_api_connextdds_event_set_callback(
9696
const rmw_event_callback_t callback,
9797
const void * const user_data);
9898

99+
RMW_CONNEXTDDS_PUBLIC
100+
bool
101+
rmw_api_connextdds_event_type_is_supported(rmw_event_type_t rmw_event_type);
102+
99103
/*****************************************************************************
100104
* Info API
101105
*****************************************************************************/

rmw_connextdds_common/src/common/rmw_event.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@
1919
/******************************************************************************
2020
* Event functions
2121
******************************************************************************/
22-
23-
static bool is_event_supported(const rmw_event_type_t event_type)
24-
{
25-
bool invalid = false;
26-
ros_event_to_dds(event_type, &invalid);
27-
return !invalid;
28-
}
29-
30-
3122
rmw_ret_t
3223
rmw_api_connextdds_publisher_event_init(
3324
rmw_event_t * rmw_event,
@@ -42,7 +33,7 @@ rmw_api_connextdds_publisher_event_init(
4233
return RMW_RET_INVALID_ARGUMENT);
4334
RMW_CHECK_ARGUMENT_FOR_NULL(rmw_event, RMW_RET_INVALID_ARGUMENT);
4435

45-
if (!is_event_supported(event_type)) {
36+
if (!rmw_api_connextdds_event_type_is_supported(event_type)) {
4637
RMW_CONNEXT_LOG_ERROR_SET("unsupported publisher event")
4738
return RMW_RET_UNSUPPORTED;
4839
}
@@ -64,6 +55,15 @@ rmw_api_connextdds_publisher_event_init(
6455
}
6556

6657

58+
bool
59+
rmw_api_connextdds_event_type_is_supported(rmw_event_type_t rmw_event_type)
60+
{
61+
bool invalid = false;
62+
ros_event_to_dds(rmw_event_type, &invalid);
63+
return !invalid;
64+
}
65+
66+
6767
rmw_ret_t
6868
rmw_api_connextdds_subscription_event_init(
6969
rmw_event_t * rmw_event,
@@ -78,7 +78,7 @@ rmw_api_connextdds_subscription_event_init(
7878
return RMW_RET_INVALID_ARGUMENT);
7979
RMW_CHECK_ARGUMENT_FOR_NULL(rmw_event, RMW_RET_INVALID_ARGUMENT);
8080

81-
if (!is_event_supported(event_type)) {
81+
if (!rmw_api_connextdds_event_type_is_supported(event_type)) {
8282
RMW_CONNEXT_LOG_ERROR_SET("unsupported subscription event")
8383
return RMW_RET_UNSUPPORTED;
8484
}

rmw_connextddsmicro/src/rmw_api_impl_rtime.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,12 @@ rmw_event_set_callback(
139139
return rmw_api_connextdds_event_set_callback(event, callback, user_data);
140140
}
141141

142+
bool
143+
rmw_event_type_is_supported(rmw_event_type_t rmw_event_type)
144+
{
145+
return rmw_api_connextdds_event_type_is_supported(rmw_event_type);
146+
}
147+
142148
/*****************************************************************************
143149
* Info API
144150
*****************************************************************************/

0 commit comments

Comments
 (0)