From 9ddd3cb6886c98065ada1948ab1db257b7a0c714 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Wed, 9 Oct 2024 15:53:39 -0700 Subject: [PATCH] Add tracing instrumentation using tracetools Signed-off-by: Christophe Bedard --- rmw_zenoh_cpp/CMakeLists.txt | 2 + rmw_zenoh_cpp/package.xml | 1 + rmw_zenoh_cpp/src/detail/rmw_client_data.cpp | 8 +++ rmw_zenoh_cpp/src/detail/rmw_client_data.hpp | 1 + rmw_zenoh_cpp/src/detail/rmw_node_data.cpp | 2 + .../src/detail/rmw_publisher_data.cpp | 20 ++++-- .../src/detail/rmw_publisher_data.hpp | 4 ++ rmw_zenoh_cpp/src/detail/rmw_service_data.cpp | 17 ++++- rmw_zenoh_cpp/src/detail/rmw_service_data.hpp | 4 ++ rmw_zenoh_cpp/src/detail/zenoh_utils.cpp | 11 ++- rmw_zenoh_cpp/src/detail/zenoh_utils.hpp | 4 +- rmw_zenoh_cpp/src/rmw_zenoh.cpp | 71 +++++++++++++++++-- 12 files changed, 131 insertions(+), 14 deletions(-) diff --git a/rmw_zenoh_cpp/CMakeLists.txt b/rmw_zenoh_cpp/CMakeLists.txt index 185fa804..732cd470 100644 --- a/rmw_zenoh_cpp/CMakeLists.txt +++ b/rmw_zenoh_cpp/CMakeLists.txt @@ -21,6 +21,7 @@ find_package(rcutils REQUIRED) find_package(rosidl_typesupport_fastrtps_c REQUIRED) find_package(rosidl_typesupport_fastrtps_cpp REQUIRED) find_package(rmw REQUIRED) +find_package(tracetools REQUIRED) find_package(zenoh_cpp_vendor REQUIRED) add_library(rmw_zenoh_cpp SHARED @@ -67,6 +68,7 @@ target_link_libraries(rmw_zenoh_cpp rosidl_typesupport_fastrtps_c::rosidl_typesupport_fastrtps_c rosidl_typesupport_fastrtps_cpp::rosidl_typesupport_fastrtps_cpp rmw::rmw + tracetools::tracetools zenohcxx::zenohc ) diff --git a/rmw_zenoh_cpp/package.xml b/rmw_zenoh_cpp/package.xml index 79272665..9376b716 100644 --- a/rmw_zenoh_cpp/package.xml +++ b/rmw_zenoh_cpp/package.xml @@ -25,6 +25,7 @@ rosidl_typesupport_fastrtps_c rosidl_typesupport_fastrtps_cpp rmw + tracetools ament_lint_auto ament_lint_common diff --git a/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp b/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp index 1c24570d..2cb07ffb 100644 --- a/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp +++ b/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp @@ -44,6 +44,8 @@ #include "rmw/get_topic_endpoint_info.h" #include "rmw/impl/cpp/macros.hpp" +#include "tracetools/tracetools.h" + namespace rmw_zenoh_cpp { ///============================================================================= @@ -363,6 +365,12 @@ rmw_ret_t ClientData::send_request( size_t data_length = ser.get_serialized_data_length(); *sequence_id = sequence_number_++; + TRACETOOLS_TRACEPOINT( + rmw_send_request, + static_cast(rmw_client_), + static_cast(ros_request), + *sequence_id); + // Send request zenoh::Session::GetOptions opts = zenoh::Session::GetOptions::create_default(); std::array local_gid = entity_->copy_gid(); diff --git a/rmw_zenoh_cpp/src/detail/rmw_client_data.hpp b/rmw_zenoh_cpp/src/detail/rmw_client_data.hpp index 44b187ba..f3e665ab 100644 --- a/rmw_zenoh_cpp/src/detail/rmw_client_data.hpp +++ b/rmw_zenoh_cpp/src/detail/rmw_client_data.hpp @@ -118,6 +118,7 @@ class ClientData final : public std::enable_shared_from_this mutable std::recursive_mutex mutex_; // The parent node. const rmw_node_t * rmw_node_; + // The rmw client. const rmw_client_t * rmw_client_; // The Entity generated for the service. std::shared_ptr entity_; diff --git a/rmw_zenoh_cpp/src/detail/rmw_node_data.cpp b/rmw_zenoh_cpp/src/detail/rmw_node_data.cpp index ed1b5b2b..23ca5e78 100644 --- a/rmw_zenoh_cpp/src/detail/rmw_node_data.cpp +++ b/rmw_zenoh_cpp/src/detail/rmw_node_data.cpp @@ -141,6 +141,7 @@ bool NodeData::create_pub_data( auto pub_data = PublisherData::make( session, + publisher, node_, entity_->node_info(), id_, @@ -276,6 +277,7 @@ bool NodeData::create_service_data( auto service_data = ServiceData::make( session, node_, + service, entity_->node_info(), id_, std::move(id), diff --git a/rmw_zenoh_cpp/src/detail/rmw_publisher_data.cpp b/rmw_zenoh_cpp/src/detail/rmw_publisher_data.cpp index b228c7cb..ed1178af 100644 --- a/rmw_zenoh_cpp/src/detail/rmw_publisher_data.cpp +++ b/rmw_zenoh_cpp/src/detail/rmw_publisher_data.cpp @@ -37,6 +37,8 @@ #include "rmw/get_topic_endpoint_info.h" #include "rmw/impl/cpp/macros.hpp" +#include "tracetools/tracetools.h" + namespace rmw_zenoh_cpp { // TODO(yuyuan): SHM, make this configurable @@ -45,6 +47,7 @@ namespace rmw_zenoh_cpp ///============================================================================= std::shared_ptr PublisherData::make( std::shared_ptr session, + const rmw_publisher_t * const rmw_publisher, const rmw_node_t * const node, liveliness::NodeInfo node_info, std::size_t node_id, @@ -157,6 +160,7 @@ std::shared_ptr PublisherData::make( return std::shared_ptr( new PublisherData{ + rmw_publisher, node, std::move(entity), std::move(session), @@ -170,6 +174,7 @@ std::shared_ptr PublisherData::make( ///============================================================================= PublisherData::PublisherData( + const rmw_publisher_t * const rmw_publisher, const rmw_node_t * rmw_node, std::shared_ptr entity, std::shared_ptr sess, @@ -178,7 +183,8 @@ PublisherData::PublisherData( zenoh::LivelinessToken token, const void * type_support_impl, std::unique_ptr type_support) -: rmw_node_(rmw_node), +: rmw_publisher_(rmw_publisher), + rmw_node_(rmw_node), entity_(std::move(entity)), sess_(std::move(sess)), pub_(std::move(pub)), @@ -245,10 +251,10 @@ rmw_ret_t PublisherData::publish( // session use different encoding formats. In our case, all key expressions // will be encoded with CDR so it does not really matter. zenoh::ZResult result; + int64_t source_timestamp = 0; auto options = zenoh::Publisher::PutOptions::create_default(); options.attachment = create_map_and_set_sequence_num( - sequence_number_++, - entity_->copy_gid()); + sequence_number_++, entity_->copy_gid(), &source_timestamp); // TODO(ahcorde): shmbuf std::vector raw_data( @@ -256,6 +262,8 @@ rmw_ret_t PublisherData::publish( reinterpret_cast(msg_bytes) + data_length); zenoh::Bytes payload(std::move(raw_data)); + TRACETOOLS_TRACEPOINT( + rmw_publish, static_cast(rmw_publisher_), ros_message, source_timestamp); pub_.put(std::move(payload), std::move(options), &result); if (result != Z_OK) { if (result == Z_ESESSION_CLOSED) { @@ -291,14 +299,18 @@ rmw_ret_t PublisherData::publish_serialized_message( // session use different encoding formats. In our case, all key expressions // will be encoded with CDR so it does not really matter. zenoh::ZResult result; + int64_t source_timestamp = 0; auto options = zenoh::Publisher::PutOptions::create_default(); - options.attachment = create_map_and_set_sequence_num(sequence_number_++, entity_->copy_gid()); + options.attachment = create_map_and_set_sequence_num( + sequence_number_++, entity_->copy_gid(), &source_timestamp); std::vector raw_data( serialized_message->buffer, serialized_message->buffer + data_length); zenoh::Bytes payload(std::move(raw_data)); + TRACETOOLS_TRACEPOINT( + rmw_publish, static_cast(rmw_publisher_), serialized_message, source_timestamp); pub_.put(std::move(payload), std::move(options), &result); if (result != Z_OK) { if (result == Z_ESESSION_CLOSED) { diff --git a/rmw_zenoh_cpp/src/detail/rmw_publisher_data.hpp b/rmw_zenoh_cpp/src/detail/rmw_publisher_data.hpp index 52c22523..7cec5406 100644 --- a/rmw_zenoh_cpp/src/detail/rmw_publisher_data.hpp +++ b/rmw_zenoh_cpp/src/detail/rmw_publisher_data.hpp @@ -45,6 +45,7 @@ class PublisherData final // Make a shared_ptr of PublisherData. static std::shared_ptr make( std::shared_ptr session, + const rmw_publisher_t * const rmw_publisher, const rmw_node_t * const node, liveliness::NodeInfo node_info, std::size_t node_id, @@ -90,6 +91,7 @@ class PublisherData final private: // Constructor. PublisherData( + const rmw_publisher_t * const rmw_publisher, const rmw_node_t * rmw_node, std::shared_ptr entity, std::shared_ptr session, @@ -101,6 +103,8 @@ class PublisherData final // Internal mutex. mutable std::mutex mutex_; + // The rmw publisher + const rmw_publisher_t * rmw_publisher_; // The parent node. const rmw_node_t * rmw_node_; // The Entity generated for the publisher. diff --git a/rmw_zenoh_cpp/src/detail/rmw_service_data.cpp b/rmw_zenoh_cpp/src/detail/rmw_service_data.cpp index 9fe075a9..7248394a 100644 --- a/rmw_zenoh_cpp/src/detail/rmw_service_data.cpp +++ b/rmw_zenoh_cpp/src/detail/rmw_service_data.cpp @@ -40,12 +40,15 @@ #include "rmw/get_topic_endpoint_info.h" #include "rmw/impl/cpp/macros.hpp" +#include "tracetools/tracetools.h" + namespace rmw_zenoh_cpp { ///============================================================================= std::shared_ptr ServiceData::make( std::shared_ptr session, const rmw_node_t * const node, + const rmw_service_t * rmw_service, liveliness::NodeInfo node_info, std::size_t node_id, std::size_t service_id, @@ -128,6 +131,7 @@ std::shared_ptr ServiceData::make( auto service_data = std::shared_ptr( new ServiceData{ node, + rmw_service, std::move(entity), session, request_members, @@ -192,6 +196,7 @@ std::shared_ptr ServiceData::make( ///============================================================================= ServiceData::ServiceData( const rmw_node_t * rmw_node, + const rmw_service_t * rmw_service, std::shared_ptr entity, std::shared_ptr session, const void * request_type_support_impl, @@ -199,6 +204,7 @@ ServiceData::ServiceData( std::unique_ptr request_type_support, std::unique_ptr response_type_support) : rmw_node_(rmw_node), + rmw_service_(rmw_service), entity_(std::move(entity)), sess_(std::move(session)), request_type_support_impl_(request_type_support_impl), @@ -438,9 +444,11 @@ rmw_ret_t ServiceData::send_response( zenoh::Query::ReplyOptions options = zenoh::Query::ReplyOptions::create_default(); std::array writer_gid; memcpy(writer_gid.data(), request_id->writer_guid, RMW_GID_STORAGE_SIZE); + int64_t source_timestamp = 0; options.attachment = create_map_and_set_sequence_num( request_id->sequence_number, - writer_gid); + writer_gid, + &source_timestamp); std::vector raw_bytes( reinterpret_cast(response_bytes), @@ -454,6 +462,13 @@ rmw_ret_t ServiceData::send_response( return RMW_RET_ERROR; } + TRACETOOLS_TRACEPOINT( + rmw_send_response, + static_cast(rmw_service_), + static_cast(ros_response), + request_id->writer_guid, + request_id->sequence_number, + source_timestamp); loaned_query.reply(service_ke, std::move(payload), std::move(options), &result); if (result != Z_OK) { RMW_SET_ERROR_MSG("unable to reply"); diff --git a/rmw_zenoh_cpp/src/detail/rmw_service_data.hpp b/rmw_zenoh_cpp/src/detail/rmw_service_data.hpp index eeeeee6c..1c557370 100644 --- a/rmw_zenoh_cpp/src/detail/rmw_service_data.hpp +++ b/rmw_zenoh_cpp/src/detail/rmw_service_data.hpp @@ -49,6 +49,7 @@ class ServiceData final : public std::enable_shared_from_this static std::shared_ptr make( std::shared_ptr session, const rmw_node_t * const node, + const rmw_service_t * rmw_service, liveliness::NodeInfo node_info, std::size_t node_id, std::size_t service_id, @@ -98,6 +99,7 @@ class ServiceData final : public std::enable_shared_from_this // Constructor. ServiceData( const rmw_node_t * rmw_node, + const rmw_service_t * rmw_service, std::shared_ptr entity, std::shared_ptr session, const void * request_type_support_impl, @@ -109,6 +111,8 @@ class ServiceData final : public std::enable_shared_from_this mutable std::mutex mutex_; // The parent node. const rmw_node_t * rmw_node_; + // The rmw service. + const rmw_service_t * rmw_service_; // The Entity generated for the service. std::shared_ptr entity_; diff --git a/rmw_zenoh_cpp/src/detail/zenoh_utils.cpp b/rmw_zenoh_cpp/src/detail/zenoh_utils.cpp index 35173656..88eb55e6 100644 --- a/rmw_zenoh_cpp/src/detail/zenoh_utils.cpp +++ b/rmw_zenoh_cpp/src/detail/zenoh_utils.cpp @@ -42,13 +42,18 @@ ZenohSession::~ZenohSession() ///============================================================================= zenoh::Bytes create_map_and_set_sequence_num( - int64_t sequence_number, std::array gid) + int64_t sequence_number, + std::array gid, + int64_t * source_timestamp) { auto now = std::chrono::system_clock::now().time_since_epoch(); auto now_ns = std::chrono::duration_cast(now); - int64_t source_timestamp = now_ns.count(); + int64_t timestamp = now_ns.count(); + if (nullptr != source_timestamp) { + *source_timestamp = timestamp; + } - rmw_zenoh_cpp::AttachmentData data(sequence_number, source_timestamp, gid); + rmw_zenoh_cpp::AttachmentData data(sequence_number, timestamp, gid); return data.serialize_to_zbytes(); } diff --git a/rmw_zenoh_cpp/src/detail/zenoh_utils.hpp b/rmw_zenoh_cpp/src/detail/zenoh_utils.hpp index 1b1efc87..cdd101b1 100644 --- a/rmw_zenoh_cpp/src/detail/zenoh_utils.hpp +++ b/rmw_zenoh_cpp/src/detail/zenoh_utils.hpp @@ -43,7 +43,9 @@ class ZenohSession final ///============================================================================= zenoh::Bytes create_map_and_set_sequence_num( - int64_t sequence_number, std::array gid); + int64_t sequence_number, + std::array gid, + int64_t * source_timestamp = nullptr); ///============================================================================= // A class to store the replies to service requests. diff --git a/rmw_zenoh_cpp/src/rmw_zenoh.cpp b/rmw_zenoh_cpp/src/rmw_zenoh.cpp index 23220fdf..2e36cc91 100644 --- a/rmw_zenoh_cpp/src/rmw_zenoh.cpp +++ b/rmw_zenoh_cpp/src/rmw_zenoh.cpp @@ -56,6 +56,8 @@ #include "rmw/validate_namespace.h" #include "rmw/validate_node_name.h" +#include "tracetools/tracetools.h" + namespace { //============================================================================== @@ -454,6 +456,14 @@ rmw_create_publisher( free_topic_name.cancel(); free_rmw_publisher.cancel(); + if (TRACETOOLS_TRACEPOINT_ENABLED(rmw_publisher_init)) { + rmw_gid_t gid{}; + // Trigger tracepoint even if we cannot get the GID + rmw_ret_t gid_ret = rmw_get_gid_for_publisher(rmw_publisher, &gid); + static_cast(gid_ret); + TRACETOOLS_DO_TRACEPOINT( + rmw_publisher_init, static_cast(rmw_publisher), gid.data); + } return rmw_publisher; } @@ -990,6 +1000,11 @@ rmw_create_subscription( free_topic_name.cancel(); free_rmw_subscription.cancel(); + // rmw does not require GIDs for subscriptions, and GIDs in rmw_zenoh are not based on any ID of + // the underlying zenoh objects, so there is no need to collect a GID here + rmw_gid_t gid{}; + TRACETOOLS_TRACEPOINT( + rmw_subscription_init, static_cast(rmw_subscription), gid.data); return rmw_subscription; } @@ -1134,7 +1149,18 @@ rmw_take( static_cast(subscription->data); RMW_CHECK_ARGUMENT_FOR_NULL(sub_data, RMW_RET_INVALID_ARGUMENT); - return sub_data->take_one_message(ros_message, nullptr, taken); + if (!TRACETOOLS_TRACEPOINT_ENABLED(rmw_take)) { + return sub_data->take_one_message(ros_message, nullptr, taken); + } + rmw_message_info_t message_info{}; + rmw_ret_t ret = sub_data->take_one_message(ros_message, &message_info, taken); + TRACETOOLS_DO_TRACEPOINT( + rmw_take, + static_cast(subscription), + static_cast(ros_message), + message_info.source_timestamp, + *taken); + return ret; } //============================================================================== @@ -1163,7 +1189,14 @@ rmw_take_with_info( static_cast(subscription->data); RMW_CHECK_ARGUMENT_FOR_NULL(sub_data, RMW_RET_INVALID_ARGUMENT); - return sub_data->take_one_message(ros_message, message_info, taken); + rmw_ret_t ret = sub_data->take_one_message(ros_message, message_info, taken); + TRACETOOLS_TRACEPOINT( + rmw_take, + static_cast(subscription), + static_cast(ros_message), + message_info->source_timestamp, + *taken); + return ret; } //============================================================================== @@ -1269,11 +1302,18 @@ __rmw_take_serialized( static_cast(subscription->data); RMW_CHECK_ARGUMENT_FOR_NULL(sub_data, RMW_RET_INVALID_ARGUMENT); - return sub_data->take_serialized_message( + rmw_ret_t ret = sub_data->take_serialized_message( serialized_message, taken, message_info ); + TRACETOOLS_TRACEPOINT( + rmw_take, + static_cast(subscription), + static_cast(serialized_message), + message_info->source_timestamp, + *taken); + return ret; } } // namespace @@ -1467,6 +1507,11 @@ rmw_create_client( free_rmw_client.cancel(); free_service_name.cancel(); + if (TRACETOOLS_TRACEPOINT_ENABLED(rmw_client_init)) { + auto client_data = static_cast(rmw_client->data); + auto gid = client_data->copy_gid(); + TRACETOOLS_DO_TRACEPOINT(rmw_client_init, static_cast(rmw_client), gid.data()); + } return rmw_client; } @@ -1561,7 +1606,15 @@ rmw_take_response( client->data, "Unable to retrieve client_data from client.", RMW_RET_INVALID_ARGUMENT); RMW_CHECK_ARGUMENT_FOR_NULL(ros_response, RMW_RET_INVALID_ARGUMENT); - return client_data->take_response(request_header, ros_response, taken); + rmw_ret_t ret = client_data->take_response(request_header, ros_response, taken); + TRACETOOLS_TRACEPOINT( + rmw_take_response, + static_cast(client), + static_cast(ros_response), + (nullptr != request_header ? request_header->request_id.sequence_number : 0LL), + (nullptr != request_header ? request_header->source_timestamp : 0LL), + *taken); + return ret; } //============================================================================== @@ -1779,10 +1832,18 @@ rmw_take_request( RMW_CHECK_ARGUMENT_FOR_NULL(request_header, RMW_RET_INVALID_ARGUMENT); RMW_CHECK_ARGUMENT_FOR_NULL(ros_request, RMW_RET_INVALID_ARGUMENT); - return service_data->take_request( + rmw_ret_t ret = service_data->take_request( request_header, ros_request, taken); + TRACETOOLS_TRACEPOINT( + rmw_take_request, + static_cast(service), + static_cast(ros_request), + request_header->request_id.writer_guid, + request_header->request_id.sequence_number, + *taken); + return ret; } //==============================================================================