Topic names (#331)

* expand topic name before invoking count pub/sub

* convenience function for get_namespace()

* uncrustify

* typo

* add get_namespace() test

* add get_namespace() for lifecycle

rclcpp/include/rclcpp/node.hpp

@@ -101,6 +101,12 @@ public:
   const char *
   get_name() const;
 
+  /// Get the namespace of the node.
+  /** \return The namespace of the node. */
+  RCLCPP_PUBLIC
+  const char *
+  get_namespace() const;
+
   /// Create and return a callback group.
   RCLCPP_PUBLIC
   rclcpp::callback_group::CallbackGroup::SharedPtr

rclcpp/include/rclcpp/node_interfaces/node_base.hpp

@@ -50,6 +50,11 @@ public:
   const char *
   get_name() const;
 
+  RCLCPP_PUBLIC
+  virtual
+  const char *
+  get_namespace() const;
+
   RCLCPP_PUBLIC
   virtual
   rclcpp::context::Context::SharedPtr

rclcpp/include/rclcpp/node_interfaces/node_base_interface.hpp

@@ -45,6 +45,13 @@ public:
   const char *
   get_name() const = 0;
 
+  /// Return the namespace of the node.
+  /** \return The namespace of the node. */
+  RCLCPP_PUBLIC
+  virtual
+  const char *
+  get_namespace() const = 0;
+
   /// Return the context of the node.
   /** \return SharedPtr to the node's context. */
   RCLCPP_PUBLIC

rclcpp/src/rclcpp/node.cpp

@@ -71,6 +71,12 @@ Node::get_name() const
   return node_base_->get_name();
 }
 
+const char *
+Node::get_namespace() const
+{
+  return node_base_->get_namespace();
+}
+
 rclcpp::callback_group::CallbackGroup::SharedPtr
 Node::create_callback_group(
   rclcpp::callback_group::CallbackGroupType group_type)

rclcpp/src/rclcpp/node_interfaces/node_base.cpp

@@ -166,6 +166,12 @@ NodeBase::get_name() const
   return rcl_node_get_name(node_handle_.get());
 }
 
+const char *
+NodeBase::get_namespace() const
+{
+  return rcl_node_get_namespace(node_handle_.get());
+}
+
 rclcpp::context::Context::SharedPtr
 NodeBase::get_context()
 {

rclcpp/src/rclcpp/node_interfaces/node_graph.cpp

@@ -120,10 +120,16 @@ NodeGraph::get_node_names() const
 size_t
 NodeGraph::count_publishers(const std::string & topic_name) const
 {
+  auto rmw_node_handle = rcl_node_get_rmw_handle(node_base_->get_rcl_node_handle());
+  auto fqdn = rclcpp::expand_topic_or_service_name(
+    topic_name,
+    rmw_node_handle->name,
+    rmw_node_handle->namespace_,
+    false);    // false = not a service
+
   size_t count;
   // TODO(wjwwood): use the rcl equivalent methods
-  auto ret = rmw_count_publishers(rcl_node_get_rmw_handle(node_base_->get_rcl_node_handle()),
+  auto ret = rmw_count_publishers(rmw_node_handle, fqdn.c_str(), &count);
-      topic_name.c_str(), &count);
   if (ret != RMW_RET_OK) {
     // *INDENT-OFF*
     throw std::runtime_error(
@@ -136,10 +142,16 @@ NodeGraph::count_publishers(const std::string & topic_name) const
 size_t
 NodeGraph::count_subscribers(const std::string & topic_name) const
 {
+  auto rmw_node_handle = rcl_node_get_rmw_handle(node_base_->get_rcl_node_handle());
+  auto fqdn = rclcpp::expand_topic_or_service_name(
+    topic_name,
+    rmw_node_handle->name,
+    rmw_node_handle->namespace_,
+    false);    // false = not a service
+
   size_t count;
   // TODO(wjwwood): use the rcl equivalent methods
-  auto ret = rmw_count_subscribers(rcl_node_get_rmw_handle(node_base_->get_rcl_node_handle()),
+  auto ret = rmw_count_subscribers(rmw_node_handle, fqdn.c_str(), &count);
-      topic_name.c_str(), &count);
   if (ret != RMW_RET_OK) {
     // *INDENT-OFF*
     throw std::runtime_error(

rclcpp/test/test_node.cpp

@@ -50,3 +50,26 @@ TEST_F(TestNode, construction_and_destruction) {
     }, rclcpp::exceptions::InvalidNamespaceError);
   }
 }
+
+TEST_F(TestNode, get_name_and_namespace) {
+  {
+    auto node = std::make_shared<rclcpp::node::Node>("my_node", "/ns");
+    EXPECT_STREQ("my_node", node->get_name());
+    EXPECT_STREQ("/ns", node->get_namespace());
+  }
+  {
+    auto node = std::make_shared<rclcpp::node::Node>("my_node", "ns");
+    EXPECT_STREQ("my_node", node->get_name());
+    EXPECT_STREQ("/ns", node->get_namespace());
+  }
+  {
+    auto node = std::make_shared<rclcpp::node::Node>("my_node", "/my/ns");
+    EXPECT_STREQ("my_node", node->get_name());
+    EXPECT_STREQ("/my/ns", node->get_namespace());
+  }
+  {
+    auto node = std::make_shared<rclcpp::node::Node>("my_node", "my/ns");
+    EXPECT_STREQ("my_node", node->get_name());
+    EXPECT_STREQ("/my/ns", node->get_namespace());
+  }
+}

rclcpp_lifecycle/include/rclcpp_lifecycle/lifecycle_node.hpp

@@ -102,6 +102,12 @@ public:
   const char *
   get_name() const;
 
+  /// Get the namespace of the node.
+  // \return The namespace of the node.
+  RCLCPP_LIFECYCLE_PUBLIC
+  const char *
+  get_namespace() const;
+
   /// Create and return a callback group.
   RCLCPP_LIFECYCLE_PUBLIC
   rclcpp::callback_group::CallbackGroup::SharedPtr

rclcpp_lifecycle/src/lifecycle_node.cpp

@@ -89,6 +89,12 @@ LifecycleNode::get_name() const
   return node_base_->get_name();
 }
 
+const char *
+LifecycleNode::get_namespace() const
+{
+  return node_base_->get_namespace();
+}
+
 rclcpp::callback_group::CallbackGroup::SharedPtr
 LifecycleNode::create_callback_group(
   rclcpp::callback_group::CallbackGroupType group_type)

rclcpp_lifecycle/test/test_lifecycle_node.cpp

@@ -123,7 +123,8 @@ rcl_lifecycle_ret_t MoodyLifecycleNode<BadMood>::on_error(const rclcpp_lifecycle
 
 TEST_F(TestDefaultStateMachine, empty_initializer) {
   auto test_node = std::make_shared<EmptyLifecycleNode>("testnode");
-
+  EXPECT_STREQ("testnode", test_node->get_name());
+  EXPECT_STREQ("/", test_node->get_namespace());
   EXPECT_EQ(State::PRIMARY_STATE_UNCONFIGURED, test_node->get_current_state().id());
 }