Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove MANUAL_BY_NODE liveliness API #379

Merged
merged 2 commits into from
May 12, 2020
Merged

Remove MANUAL_BY_NODE liveliness API #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
457203c
Remove MANUAL_BY_NODE liveliness API
ivanpauno May 7, 2020
1ad4a8d
Undo unrelated changes
ivanpauno May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions rmw_fastrtps_cpp/src/rmw_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,6 @@ rmw_destroy_node(rmw_node_t * node)
return rmw_fastrtps_shared_cpp::decrement_context_impl_ref_count(context);
}

rmw_ret_t
rmw_node_assert_liveliness(const rmw_node_t * node)
{
return rmw_fastrtps_shared_cpp::__rmw_node_assert_liveliness(
eprosima_fastrtps_identifier, node);
}

const rmw_guard_condition_t *
rmw_node_get_graph_guard_condition(const rmw_node_t * node)
{
Expand Down
7 changes: 0 additions & 7 deletions rmw_fastrtps_dynamic_cpp/src/rmw_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,6 @@ rmw_destroy_node(rmw_node_t * node)
return rmw_fastrtps_shared_cpp::decrement_context_impl_ref_count(context);
}

rmw_ret_t
rmw_node_assert_liveliness(const rmw_node_t * node)
{
return rmw_fastrtps_shared_cpp::__rmw_node_assert_liveliness(
eprosima_fastrtps_identifier, node);
}

const rmw_guard_condition_t *
rmw_node_get_graph_guard_condition(const rmw_node_t * node)
{
Expand Down
3 changes: 0 additions & 3 deletions rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/qos.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ dds_qos_to_rmw_qos(
case eprosima::fastrtps::AUTOMATIC_LIVELINESS_QOS:
qos->liveliness = RMW_QOS_POLICY_LIVELINESS_AUTOMATIC;
break;
case eprosima::fastrtps::MANUAL_BY_PARTICIPANT_LIVELINESS_QOS:
qos->liveliness = RMW_QOS_POLICY_LIVELINESS_MANUAL_BY_NODE;
break;
case eprosima::fastrtps::MANUAL_BY_TOPIC_LIVELINESS_QOS:
qos->liveliness = RMW_QOS_POLICY_LIVELINESS_MANUAL_BY_TOPIC;
break;
Expand Down
6 changes: 0 additions & 6 deletions rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/rmw_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,6 @@ __rmw_destroy_node(
const char * identifier,
rmw_node_t * node);

RMW_FASTRTPS_SHARED_CPP_PUBLIC
rmw_ret_t
__rmw_node_assert_liveliness(
const char * identifier,
const rmw_node_t * node);

RMW_FASTRTPS_SHARED_CPP_PUBLIC
const rmw_guard_condition_t *
__rmw_node_get_graph_guard_condition(const rmw_node_t * node);
Expand Down
3 changes: 0 additions & 3 deletions rmw_fastrtps_shared_cpp/src/qos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,6 @@ bool fill_entity_qos_from_profile(
case RMW_QOS_POLICY_LIVELINESS_AUTOMATIC:
entity_qos.m_liveliness.kind = eprosima::fastrtps::AUTOMATIC_LIVELINESS_QOS;
break;
case RMW_QOS_POLICY_LIVELINESS_MANUAL_BY_NODE:
entity_qos.m_liveliness.kind = eprosima::fastrtps::MANUAL_BY_PARTICIPANT_LIVELINESS_QOS;
break;
case RMW_QOS_POLICY_LIVELINESS_MANUAL_BY_TOPIC:
entity_qos.m_liveliness.kind = eprosima::fastrtps::MANUAL_BY_TOPIC_LIVELINESS_QOS;
break;
Expand Down
11 changes: 0 additions & 11 deletions rmw_fastrtps_shared_cpp/src/rmw_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,17 +152,6 @@ __rmw_destroy_node(
return RMW_RET_OK;
}

rmw_ret_t
__rmw_node_assert_liveliness(
const char * identifier,
const rmw_node_t * node)
{
(void)identifier;
(void)node;

return RMW_RET_UNSUPPORTED;
}

const rmw_guard_condition_t *
__rmw_node_get_graph_guard_condition(const rmw_node_t * node)
{
Expand Down
2 changes: 1 addition & 1 deletion rmw_fastrtps_shared_cpp/test/test_dds_attributes_to_rmw_qos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ TEST_F(DDSAttributesToRMWQosTest, test_subscriber_liveliness_conversion) {
subscriber_attributes_.qos.m_liveliness.kind =
eprosima::fastrtps::MANUAL_BY_PARTICIPANT_LIVELINESS_QOS;
dds_attributes_to_rmw_qos(subscriber_attributes_, &qos_profile_);
EXPECT_EQ(qos_profile_.liveliness, RMW_QOS_POLICY_LIVELINESS_MANUAL_BY_NODE);
EXPECT_EQ(qos_profile_.liveliness, RMW_QOS_POLICY_LIVELINESS_UNKNOWN);
}

TEST_F(DDSAttributesToRMWQosTest, test_subscriber_liveliness_lease_duration_conversion) {
Expand Down