From 35092f89ffc2c4967a39b08dea8e9c66d9984494 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Fri, 14 Jun 2019 10:08:24 +0200 Subject: [PATCH] Switch to generic 'callback_start|end' event --- tracetools/include/tracetools/tracetools.h | 66 ++++++--------- tracetools/scripts/setup-lttng.sh | 8 +- tracetools/src/tp_call.tp | 92 ++++++--------------- tracetools/src/tracetools.c | 95 ++++++++-------------- 4 files changed, 83 insertions(+), 178 deletions(-) diff --git a/tracetools/include/tracetools/tracetools.h b/tracetools/include/tracetools/tracetools.h index d04ead3..a03079e 100644 --- a/tracetools/include/tracetools/tracetools.h +++ b/tracetools/include/tracetools/tracetools.h @@ -65,21 +65,6 @@ void TRACEPOINT( const void * subscription_handle, const void * callback); -/** - * tp: rclcpp_subscription_callback_start - */ -void TRACEPOINT( - rclcpp_subscription_callback_start, - const void * callback, - const bool is_intra_process); - -/** - * tp: rclcpp_subscription_callback_end - */ -void TRACEPOINT( - rclcpp_subscription_callback_end, - const void * callback); - /** * tp: rcl_service_init */ @@ -98,20 +83,6 @@ void TRACEPOINT( const void * service_handle, const void * callback); -/** - * tp: rclcpp_service_callback_start - */ -void TRACEPOINT( - rclcpp_service_callback_start, - const void * callback); - -/** - * tp: rclcpp_service_callback_end - */ -void TRACEPOINT( - rclcpp_service_callback_end, - const void * callback); - /** * tp: rcl_client_init */ @@ -138,20 +109,6 @@ void TRACEPOINT( const void * timer_handle, const void * callback); -/** - * tp: rclcpp_timer_callback_start - */ -void TRACEPOINT( - rclcpp_timer_callback_start, - const void * callback); - -/** - * tp: rclcpp_timer_callback_end - */ -void TRACEPOINT( - rclcpp_timer_callback_end, - const void * callback); - /** * tp: rclcpp_callback_register */ @@ -160,6 +117,29 @@ void TRACEPOINT( const void * callback, const char * function_symbol); +/** + * tp: callback_start + */ +void TRACEPOINT( + callback_start, + const void * callback, + const bool is_intra_process); + +/** + * tp: callback_start + * (is_intra_process=false) + */ +void TRACEPOINT( + callback_start, + const void * callback); + +/** + * tp: callback_end + */ +void TRACEPOINT( + callback_end, + const void * callback); + #ifdef __cplusplus } #endif diff --git a/tracetools/scripts/setup-lttng.sh b/tracetools/scripts/setup-lttng.sh index 7305f53..da5ae8e 100755 --- a/tracetools/scripts/setup-lttng.sh +++ b/tracetools/scripts/setup-lttng.sh @@ -7,16 +7,14 @@ for event in \ ros2:rcl_publisher_init \ ros2:rcl_subscription_init \ ros2:rclcpp_subscription_callback_added \ - ros2:rclcpp_subscription_callback_start \ - ros2:rclcpp_subscription_callback_end \ ros2:rcl_service_init \ ros2:rclcpp_service_callback_added \ - ros2:rclcpp_service_callback_start \ - ros2:rclcpp_service_callback_end \ ros2:rcl_client_init \ ros2:rcl_timer_init \ ros2:rclcpp_timer_callback_added \ - ros2:rclcpp_register_callback + ros2:rclcpp_register_callback \ + ros2:callback_start \ + ros2:callback_end do lttng enable-event -c ros2 -u $event done diff --git a/tracetools/src/tp_call.tp b/tracetools/src/tp_call.tp index 5f62f3e..dc58fb4 100644 --- a/tracetools/src/tp_call.tp +++ b/tracetools/src/tp_call.tp @@ -79,30 +79,6 @@ TRACEPOINT_EVENT( ) ) -TRACEPOINT_EVENT( - ros2, - rclcpp_subscription_callback_start, - TP_ARGS( - const void *, callback_arg, - int, is_intra_process_arg - ), - TP_FIELDS( - ctf_integer_hex(const void *, callback, callback_arg) - ctf_integer(int, is_intra_process, is_intra_process_arg) - ) -) - -TRACEPOINT_EVENT( - ros2, - rclcpp_subscription_callback_end, - TP_ARGS( - const void *, callback_arg - ), - TP_FIELDS( - ctf_integer_hex(const void *, callback, callback_arg) - ) -) - TRACEPOINT_EVENT( ros2, rcl_service_init, @@ -133,28 +109,6 @@ TRACEPOINT_EVENT( ) ) -TRACEPOINT_EVENT( - ros2, - rclcpp_service_callback_start, - TP_ARGS( - const void *, callback_arg - ), - TP_FIELDS( - ctf_integer_hex(const void *, callback, callback_arg) - ) -) - -TRACEPOINT_EVENT( - ros2, - rclcpp_service_callback_end, - TP_ARGS( - const void *, callback_arg - ), - TP_FIELDS( - ctf_integer_hex(const void *, callback, callback_arg) - ) -) - TRACEPOINT_EVENT( ros2, rcl_client_init, @@ -198,28 +152,6 @@ TRACEPOINT_EVENT( ) ) -TRACEPOINT_EVENT( - ros2, - rclcpp_timer_callback_start, - TP_ARGS( - const void *, callback_arg - ), - TP_FIELDS( - ctf_integer_hex(const void *, callback, callback_arg) - ) -) - -TRACEPOINT_EVENT( - ros2, - rclcpp_timer_callback_end, - TP_ARGS( - const void *, callback_arg - ), - TP_FIELDS( - ctf_integer_hex(const void *, callback, callback_arg) - ) -) - TRACEPOINT_EVENT( ros2, rclcpp_callback_register, @@ -232,3 +164,27 @@ TRACEPOINT_EVENT( ctf_string(symbol, symbol_arg) ) ) + +TRACEPOINT_EVENT( + ros2, + callback_start, + TP_ARGS( + const void *, callback_arg, + int, is_intra_process_arg + ), + TP_FIELDS( + ctf_integer_hex(const void *, callback, callback_arg) + ctf_integer(int, is_intra_process, is_intra_process_arg) + ) +) + +TRACEPOINT_EVENT( + ros2, + callback_end, + TP_ARGS( + const void *, callback_arg + ), + TP_FIELDS( + ctf_integer_hex(const void *, callback, callback_arg) + ) +) diff --git a/tracetools/src/tracetools.c b/tracetools/src/tracetools.c index 948929b..668cac0 100644 --- a/tracetools/src/tracetools.c +++ b/tracetools/src/tracetools.c @@ -91,28 +91,6 @@ void TRACEPOINT( callback); } -void TRACEPOINT( - rclcpp_subscription_callback_start, - const void * callback, - const bool is_intra_process) -{ - CONDITIONAL_TP( - ros2, - rclcpp_subscription_callback_start, - callback, - (is_intra_process ? 1 : 0)); -} - -void TRACEPOINT( - rclcpp_subscription_callback_end, - const void * callback) -{ - CONDITIONAL_TP( - ros2, - rclcpp_subscription_callback_end, - callback); -} - void TRACEPOINT( rcl_service_init, const void * service_handle, @@ -141,26 +119,6 @@ void TRACEPOINT( callback); } -void TRACEPOINT( - rclcpp_service_callback_start, - const void * callback) -{ - CONDITIONAL_TP( - ros2, - rclcpp_service_callback_start, - callback); -} - -void TRACEPOINT( - rclcpp_service_callback_end, - const void * callback) -{ - CONDITIONAL_TP( - ros2, - rclcpp_service_callback_end, - callback); -} - void TRACEPOINT( rcl_client_init, const void * client_handle, @@ -201,26 +159,6 @@ void TRACEPOINT( callback); } -void TRACEPOINT( - rclcpp_timer_callback_start, - const void * callback) -{ - CONDITIONAL_TP( - ros2, - rclcpp_timer_callback_start, - callback); -} - -void TRACEPOINT( - rclcpp_timer_callback_end, - const void * callback) -{ - CONDITIONAL_TP( - ros2, - rclcpp_timer_callback_end, - callback); -} - void TRACEPOINT( rclcpp_callback_register, const void * callback, @@ -232,3 +170,36 @@ void TRACEPOINT( callback, function_symbol); } + +void TRACEPOINT( + callback_start, + const void * callback, + const bool is_intra_process) +{ + CONDITIONAL_TP( + ros2, + callback_start, + callback, + (is_intra_process ? 1 : 0)); +} + +void TRACEPOINT( + callback_start, + const void * callback) +{ + CONDITIONAL_TP( + ros2, + callback_start, + callback, + 0); +} + +void TRACEPOINT( + callback_end, + const void * callback) +{ + CONDITIONAL_TP( + ros2, + callback_end, + callback); +}