From a169a404328d4626d70be9e7fe5c37868746e789 Mon Sep 17 00:00:00 2001 From: ymski <114902604+ymski@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:42:08 +0900 Subject: [PATCH] feat: change publish trace point definition (#136) * change publish tp Signed-off-by: yamasaki <114902604+ymski@users.noreply.github.com> * refactor Signed-off-by: yamasaki <114902604+ymski@users.noreply.github.com> --------- Signed-off-by: yamasaki <114902604+ymski@users.noreply.github.com> --- CARET_trace/src/ros_trace_points.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/CARET_trace/src/ros_trace_points.cpp b/CARET_trace/src/ros_trace_points.cpp index 4e52866f..175fbcdc 100644 --- a/CARET_trace/src/ros_trace_points.cpp +++ b/CARET_trace/src/ros_trace_points.cpp @@ -571,47 +571,43 @@ void ros_trace_dispatch_intra_process_subscription_callback( void ros_trace_rclcpp_publish( const void * publisher_handle, - const void * message, - const uint64_t message_timestamp) + const void * message) { static auto & context = Singleton::get_instance(); static auto & controller = context.get_controller(); static void * orig_func = dlsym(RTLD_NEXT, __func__); - using functionT = void (*)(const void *, const void *, const uint64_t); + using functionT = void (*)(const void *, const void *); if (controller.is_allowed_publisher_handle(publisher_handle) && context.is_recording_allowed()) { - ((functionT) orig_func)(publisher_handle, message, message_timestamp); + ((functionT) orig_func)(publisher_handle, message); #ifdef DEBUG_OUTPUT std::cerr << "rclcpp_publish," << publisher_handle << "," << - message << "," << - message_timestamp << std::endl; + message << std::endl; #endif } } void ros_trace_rclcpp_intra_publish( const void * publisher_handle, - const void * message, - const uint64_t message_timestamp) + const void * message) { static auto & context = Singleton::get_instance(); static auto & controller = context.get_controller(); static void * orig_func = dlsym(RTLD_NEXT, __func__); - using functionT = void (*)(const void *, const void *, const uint64_t message_timestamp); + using functionT = void (*)(const void *, const void *); if (controller.is_allowed_publisher_handle(publisher_handle) && context.is_recording_allowed()) { - ((functionT) orig_func)(publisher_handle, message, message_timestamp); + ((functionT) orig_func)(publisher_handle, message); #ifdef DEBUG_OUTPUT std::cerr << "rclcpp_intra_publish," << publisher_handle << "," << - message << "," << - message_timestamp << std::endl; + message << std::endl; #endif } }