Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

Stubs for rmw_get_publishers_info_by_topic and rmw_get_subscriptions_info_by_topic #377

Merged
merged 7 commits into from
Jan 14, 2020
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
3 changes: 2 additions & 1 deletion rmw_connext_cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ add_library(
src/rmw_trigger_guard_condition.cpp
src/rmw_wait.cpp
src/rmw_wait_set.cpp
src/serialization_format.cpp)
src/serialization_format.cpp
src/rmw_get_topic_info.cpp)
ament_target_dependencies(rmw_connext_cpp
"rcutils"
"rmw"
Expand Down
45 changes: 45 additions & 0 deletions rmw_connext_cpp/src/rmw_get_topic_info.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
//
// 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 "rmw/get_topic_info.h"
#include "rmw/topic_info_array.h"
#include "rmw_connext_shared_cpp/topic_info.hpp"
#include "rmw_connext_cpp/identifier.hpp"

extern "C"
{
rmw_ret_t
rmw_get_publishers_info_by_topic(
const rmw_node_t * node,
rcutils_allocator_t * allocator,
const char * topic_name,
bool no_mangle,
rmw_topic_info_array_t * publishers_info)
{
return get_publishers_info_by_topic(rti_connext_identifier, node, allocator, topic_name,
no_mangle, publishers_info);
wjwwood marked this conversation as resolved.
Show resolved Hide resolved
}

rmw_ret_t
rmw_get_subscriptions_info_by_topic(
const rmw_node_t * node,
rcutils_allocator_t * allocator,
const char * topic_name,
bool no_mangle,
rmw_topic_info_array_t * subscriptions_info)
{
return get_subscriptions_info_by_topic(rti_connext_identifier, node, allocator, topic_name,
no_mangle, subscriptions_info);
}
} // extern "C"
25 changes: 25 additions & 0 deletions rmw_connext_dynamic_cpp/src/functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@
#include "rmw/allocators.h"
#include "rmw/error_handling.h"
#include "rmw/get_service_names_and_types.h"
#include "rmw/get_topic_info.h"
#include "rmw/get_topic_names_and_types.h"
#include "rmw/init.h"
#include "rmw/rmw.h"
#include "rmw/topic_info_array.h"
#include "rmw/types.h"

ivanpauno marked this conversation as resolved.
Show resolved Hide resolved
#include "rosidl_generator_c/primitives_sequence_functions.h"
Expand All @@ -75,6 +77,7 @@
#include "rosidl_typesupport_introspection_c/visibility_control.h"

#include "rmw_connext_shared_cpp/shared_functions.hpp"
#include "rmw_connext_shared_cpp/topic_info.hpp"
#include "rmw_connext_shared_cpp/types.hpp"

#include "./macros.hpp"
Expand Down Expand Up @@ -2704,6 +2707,28 @@ rmw_count_subscribers(
return count_subscribers(rti_connext_dynamic_identifier, node, topic_name, count);
}

rmw_ret_t
rmw_get_publishers_info_by_topic(
const rmw_node_t * node,
rcutils_allocator_t * allocator,
const char * topic_name,
bool no_mangle,
rmw_topic_info_array_t * publishers_info)
{
return get_publishers_info_by_topic(rti_connext_dynamic_identifier, node, allocator, topic_name, no_mangle, publishers_info);
}

rmw_ret_t
rmw_get_subscriptions_info_by_topic(
const rmw_node_t * node,
rcutils_allocator_t * allocator,
const char * topic_name,
bool no_mangle,
rmw_topic_info_array_t * subscriptions_info)
{
return get_subscriptions_info_by_topic(rti_connext_dynamic_identifier, node, allocator, topic_name, no_mangle, subscriptions_info);
}

rmw_ret_t
rmw_get_gid_for_publisher(const rmw_publisher_t * publisher, rmw_gid_t * gid)
{
Expand Down
3 changes: 2 additions & 1 deletion rmw_connext_shared_cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ add_library(
src/wait_set.cpp
src/types/custom_data_reader_listener.cpp
src/types/custom_publisher_listener.cpp
src/types/custom_subscriber_listener.cpp)
src/types/custom_subscriber_listener.cpp
src/topic_info.cpp)
ament_target_dependencies(rmw_connext_shared_cpp
"rcpputils"
"rcutils"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@
#include "types.hpp"
#include "wait.hpp"
#include "wait_set.hpp"
#include "topic_info.hpp"

#endif // RMW_CONNEXT_SHARED_CPP__SHARED_FUNCTIONS_HPP_
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
//
// 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.

#ifndef RMW_CONNEXT_SHARED_CPP__TOPIC_INFO_HPP_
#define RMW_CONNEXT_SHARED_CPP__TOPIC_INFO_HPP_

#include "rmw/topic_info_array.h"
#include "rmw_connext_shared_cpp/visibility_control.h"

RMW_CONNEXT_SHARED_CPP_PUBLIC
rmw_ret_t
get_publishers_info_by_topic(
const char * identifier,
const rmw_node_t * node,
rcutils_allocator_t * allocator,
const char * topic_name,
bool no_mangle,
rmw_topic_info_array_t * publishers_info);

RMW_CONNEXT_SHARED_CPP_PUBLIC
rmw_ret_t
get_subscriptions_info_by_topic(
const char * identifier,
const rmw_node_t * node,
rcutils_allocator_t * allocator,
const char * topic_name,
bool no_mangle,
rmw_topic_info_array_t * subscriptions_info);

#endif // RMW_CONNEXT_SHARED_CPP__TOPIC_INFO_HPP_
43 changes: 43 additions & 0 deletions rmw_connext_shared_cpp/src/topic_info.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
//
// 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 <map>

#include "rmw_connext_shared_cpp/topic_info.hpp"

#include "rmw/error_handling.h"

rmw_ret_t
get_publishers_info_by_topic(
const char * /* unused_param */,
const rmw_node_t * /* unused_param */,
rcutils_allocator_t * /* unused_param */,
const char * /* unused_param */,
bool /* unused_param */,
rmw_topic_info_array_t * /* unused_param */)
{
return RMW_RET_UNSUPPORTED;
ivanpauno marked this conversation as resolved.
Show resolved Hide resolved
}

rmw_ret_t
get_subscriptions_info_by_topic(
const char * /* unused_param */,
const rmw_node_t * /* unused_param */,
rcutils_allocator_t * /* unused_param */,
const char * /* unused_param */,
bool /* unused_param */,
rmw_topic_info_array_t * /* unused_param */)
{
return RMW_RET_UNSUPPORTED;
ivanpauno marked this conversation as resolved.
Show resolved Hide resolved
}