Remove MANUAL_BY_NODE liveliness API (#379)

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
ros2 · May 12, 2020 · 0a6b713 · 0a6b713
1 parent d30f938
commit 0a6b713
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 38 deletions.
diff --git a/rmw_fastrtps_cpp/src/rmw_node.cpp b/rmw_fastrtps_cpp/src/rmw_node.cpp
@@ -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)
 {

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_node.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_node.cpp
@@ -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)
 {

diff --git a/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/qos.hpp b/rmw_fastrtps_shared_cpp/include/rmw_fastrtps_shared_cpp/qos.hpp
@@ -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;

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
@@ -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);

diff --git a/rmw_fastrtps_shared_cpp/src/qos.cpp b/rmw_fastrtps_shared_cpp/src/qos.cpp
@@ -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;

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_node.cpp b/rmw_fastrtps_shared_cpp/src/rmw_node.cpp
@@ -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)
 {

diff --git a/rmw_fastrtps_shared_cpp/test/test_dds_attributes_to_rmw_qos.cpp b/rmw_fastrtps_shared_cpp/test/test_dds_attributes_to_rmw_qos.cpp
@@ -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) {