Add function to get publisher actual qos settings

rcl/include/rcl/publisher.h

@@ -455,7 +455,7 @@ rcl_publisher_is_valid_except_context(const rcl_publisher_t * publisher);
  * \param[out] subscription_count number of matched subscriptions
  * \return `RCL_RET_OK` if the count was retrieved, or
  * \return `RCL_RET_INVALID_ARGUMENT` if any arguments are invalid, or
- * \return `RCL_RET_SUBSCRIPTION_INVALID` if the subscription is invalid, or
+ * \return `RCL_RET_PUBLISHER_INVALID` if the publisher is invalid, or
  * \return `RCL_RET_ERROR` if an unspecified error occurs.
  */
 RCL_PUBLIC
@@ -465,6 +465,33 @@ rcl_publisher_get_subscription_count(
   const rcl_publisher_t * publisher,
   size_t * subscription_count);
 
+/// Get the actual qos settings of the publisher.
+/**
+ * Used to get the actual qos settings of the publisher.
+ * This resolves what is the actual value of RMW_*_SYSTEM_DEFAULT.
+ *
+ * <hr>
+ * Attribute          | Adherence
+ * ------------------ | -------------
+ * Allocates Memory   | No
+ * Thread-Safe        | Yes
+ * Uses Atomics       | No
+ * Lock-Free          | Yes
+ *
+ * \param[in] publisher pointer to the rcl publisher
+ * \param[out] qos the actual qos settings
+ * \return `RCL_RET_OK` if the count was retrieved, or
+ * \return `RCL_RET_INVALID_ARGUMENT` if any arguments are invalid, or
+ * \return `RCL_RET_PUBLISHER_INVALID` if the publisher is invalid, or
+ * \return `RCL_RET_ERROR` if an unspecified error occurs.
+ */
+RCL_PUBLIC
+RCL_WARN_UNUSED
+rmw_ret_t
+rcl_publisher_get_actual_qos(
+  const rcl_publisher_t * publisher,
+  rmw_qos_profile_t * qos);
+
 #ifdef __cplusplus
 }
 #endif

rcl/src/rcl/publisher.c

@@ -349,6 +349,29 @@ rcl_publisher_get_subscription_count(
   return RCL_RET_OK;
 }
 
+rmw_ret_t
+rcl_publisher_get_actual_qos(
+  const rcl_publisher_t * publisher,
+  rmw_qos_profile_t * qos)
+{
+  if (!rcl_publisher_is_valid(publisher)) {
+    return RCL_RET_PUBLISHER_INVALID;
+  }
+  RCL_CHECK_ARGUMENT_FOR_NULL(qos, RCL_RET_INVALID_ARGUMENT);
+
+  rmw_ret_t ret = rmw_publisher_get_actual_qos(publisher->impl->rmw_handle,
+      qos);
+
+  if (ret != RMW_RET_OK) {
+    RCL_SET_ERROR_MSG(rmw_get_error_string().str);
+    return rcl_convert_rmw_ret_to_rcl_ret(ret);
+  }
+  qos->avoid_ros_namespace_conventions =
+    publisher->impl->options.qos.avoid_ros_namespace_conventions;
+
+  return RCL_RET_OK;
+}
+
 #ifdef __cplusplus
 }
 #endif

rcl/test/CMakeLists.txt

@@ -119,6 +119,14 @@ function(test_target_function)
     AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
   )
 
+  rcl_add_custom_gtest(test_get_actual_qos${target_suffix}
+    SRCS rcl/test_get_actual_qos.cpp
+    ENV ${rmw_implementation_env_var}
+    APPEND_LIBRARY_DIRS ${extra_lib_dirs}
+    LIBRARIES ${PROJECT_NAME}
+    AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
+  )
+
   rcl_add_custom_gtest(test_init${target_suffix}
     SRCS rcl/test_init.cpp
     ENV ${rmw_implementation_env_var} ${memory_tools_ld_preload_env_var}

rcl/test/rcl/test_get_actual_qos.cpp

@@ -0,0 +1,181 @@
+// Copyright 2018 Open Source Robotics Foundation, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#include <gtest/gtest.h>
+
+#include <chrono>
+#include <string>
+#include <thread>
+
+#include "rcl/error_handling.h"
+#include "rcl/rcl.h"
+#include "rcl/publisher.h"
+
+#include "rcutils/logging_macros.h"
+
+#include "test_msgs/msg/primitives.h"
+#include "test_msgs/srv/primitives.h"
+
+#ifdef RMW_IMPLEMENTATION
+# define CLASSNAME_(NAME, SUFFIX) NAME ## __ ## SUFFIX
+# define CLASSNAME(NAME, SUFFIX) CLASSNAME_(NAME, SUFFIX)
+#else
+# define CLASSNAME(NAME, SUFFIX) NAME
+#endif
+
+#define TEST_FIXTURE_P_RMW(test_fixture_name) CLASSNAME(test_fixture_name, \
+    RMW_IMPLEMENTATION)
+#define APPLY(macro, ...) macro(__VA_ARGS__)
+#define TEST_P_RMW(test_case_name, test_name) APPLY(TEST_P, \
+    CLASSNAME(test_case_name, RMW_IMPLEMENTATION), test_name)
+#define INSTANTIATE_TEST_CASE_P_RMW(instance_name, test_case_name, ...) APPLY( \
+    INSTANTIATE_TEST_CASE_P, instance_name, CLASSNAME(test_case_name, \
+    RMW_IMPLEMENTATION), __VA_ARGS__)
+
+/**
+ * Parameterized test.
+ * The first param are the NodeOptions used to create the nodes.
+ * The second param are the expect intraprocess count results.
+ */
+struct CLASSNAME (TestParameters, RMW_IMPLEMENTATION)
+{
+rmw_qos_profile_t qos_to_set;
+rmw_qos_profile_t qos_expected;
+std::string description;
+};
+
+std::ostream & operator<<(
+  std::ostream & out,
+  const CLASSNAME(TestParameters, RMW_IMPLEMENTATION) & params)
+{
+  out << params.description;
+  return out;
+}
+
+
+class CLASSNAME (TestGetActualQoS, RMW_IMPLEMENTATION)
+  : public ::testing::TestWithParam<CLASSNAME(TestParameters, RMW_IMPLEMENTATION)>
+{
+public:
+  rcl_node_t * node_ptr;
+  rcl_context_t * context_ptr;
+  void SetUp()
+  {
+    rcl_ret_t ret;
+    rcl_node_options_t node_options = rcl_node_get_default_options();
+
+    rcl_init_options_t init_options = rcl_get_zero_initialized_init_options();
+    ret = rcl_init_options_init(&init_options, rcl_get_default_allocator());
+    ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
+    this->context_ptr = new rcl_context_t;
+    *this->context_ptr = rcl_get_zero_initialized_context();
+    ret = rcl_init(0, nullptr, &init_options, this->context_ptr);
+    ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
+    this->node_ptr = new rcl_node_t;
+    *this->node_ptr = rcl_get_zero_initialized_node();
+    const char * name = "test_get_actual_qos_node";
+    ret = rcl_node_init(this->node_ptr, name, "", this->context_ptr, &node_options);
+    ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
+  }
+
+  void TearDown()
+  {
+    rcl_ret_t ret;
+
+    ret = rcl_node_fini(this->node_ptr);
+    delete this->node_ptr;
+    EXPECT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
+
+    ret = rcl_shutdown(this->context_ptr);
+    EXPECT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
+
+    ret = rcl_context_fini(this->context_ptr);
+    delete this->context_ptr;
+    EXPECT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
+  }
+};
+
+TEST_P(CLASSNAME(TestGetActualQoS, RMW_IMPLEMENTATION), test_publisher_get_qos_settings) {
+  CLASSNAME(TestParameters, RMW_IMPLEMENTATION) parameters =
+    GetParam();
+  std::string topic_name("/test_publisher_get_actual_qos__");
+  rcl_ret_t ret;
+
+  rcl_publisher_t pub = rcl_get_zero_initialized_publisher();
+  rcl_publisher_options_t pub_ops = rcl_publisher_get_default_options();
+  pub_ops.qos = parameters.qos_to_set;
+  auto ts = ROSIDL_GET_MSG_TYPE_SUPPORT(test_msgs, msg, Primitives);
+  ret = rcl_publisher_init(&pub, this->node_ptr, ts, topic_name.c_str(), &pub_ops);
+  EXPECT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
+  rcl_reset_error();
+
+  rmw_qos_profile_t qos;
+  ret = rcl_publisher_get_actual_qos(&pub, &qos);
+  EXPECT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
+  EXPECT_EQ(
+    parameters.qos_to_set.history,
+    parameters.qos_expected.history);
+  EXPECT_EQ(
+    parameters.qos_to_set.depth,
+    parameters.qos_expected.depth);
+  EXPECT_EQ(
+    parameters.qos_to_set.reliability,
+    parameters.qos_expected.reliability);
+  EXPECT_EQ(
+    parameters.qos_to_set.durability,
+    parameters.qos_expected.durability);
+  EXPECT_EQ(
+    parameters.qos_to_set.avoid_ros_namespace_conventions,
+    parameters.qos_expected.avoid_ros_namespace_conventions);
+
+  ret = rcl_publisher_fini(&pub, this->node_ptr);
+  EXPECT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
+  rcl_reset_error();
+}
+
+CLASSNAME(TestParameters, RMW_IMPLEMENTATION) parameters[] = {
+  /*
+    Testing with default qos settings.
+   */
+  {
+    rmw_qos_profile_default,
+    rmw_qos_profile_default,
+    "publisher_default_qos"
+  },
+  /*
+    Test with non-default settings.
+   */
+  {
+    {
+      RMW_QOS_POLICY_HISTORY_KEEP_ALL,
+      1000,
+      RMW_QOS_POLICY_RELIABILITY_BEST_EFFORT,
+      RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL,
+      true
+    },
+    {
+      RMW_QOS_POLICY_HISTORY_KEEP_ALL,
+      1000,
+      RMW_QOS_POLICY_RELIABILITY_BEST_EFFORT,
+      RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL,
+      true
+    },
+    "publisher_non_default_qos"
+  }
+};
+
+INSTANTIATE_TEST_CASE_P_RMW(
+  TestWithDifferentQoSSettings,
+  TestGetActualQoS,
+  ::testing::ValuesIn(parameters),
+  ::testing::PrintToStringParamName());