niklas/ros2_tracing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move tracepoint provider name to tracepoint macro

Browse source
This commit is contained in:
Christophe Bedard 2019-11-14 14:24:18 -08:00
parent 44166ff48f
commit 2740d40b0f
1 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tracetools/src/tracetools.c
View file

@ -19,7 +19,7 @@
#if defined(TRACETOOLS_LTTNG_ENABLED) #if defined(TRACETOOLS_LTTNG_ENABLED)
# include "tracetools/tp_call.h" # include "tracetools/tp_call.h"
# define CONDITIONAL_TP(...) \ # define CONDITIONAL_TP(...) \
tracepoint(__VA_ARGS__) tracepoint(TRACEPOINT_PROVIDER, __VA_ARGS__)
#else #else
# define CONDITIONAL_TP(...) # define CONDITIONAL_TP(...)
#endif #endif
@ -46,7 +46,6 @@ void TRACEPOINT(
const void * context_handle) const void * context_handle)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rcl_init, rcl_init,
context_handle, context_handle,
tracetools_VERSION); tracetools_VERSION);
@ -60,7 +59,6 @@ void TRACEPOINT(
const char * node_namespace) const char * node_namespace)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rcl_node_init, rcl_node_init,
node_handle, node_handle,
rmw_handle, rmw_handle,
@ -77,7 +75,6 @@ void TRACEPOINT(
const size_t queue_depth) const size_t queue_depth)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rcl_publisher_init, rcl_publisher_init,
publisher_handle, publisher_handle,
node_handle, node_handle,
@ -95,7 +92,6 @@ void TRACEPOINT(
const size_t queue_depth) const size_t queue_depth)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rcl_subscription_init, rcl_subscription_init,
subscription_handle, subscription_handle,
node_handle, node_handle,
@ -110,7 +106,6 @@ void TRACEPOINT(
const void * subscription) const void * subscription)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rclcpp_subscription_init, rclcpp_subscription_init,
subscription_handle, subscription_handle,
subscription); subscription);
@ -122,7 +117,6 @@ void TRACEPOINT(
const void * callback) const void * callback)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rclcpp_subscription_callback_added, rclcpp_subscription_callback_added,
subscription, subscription,
callback); callback);
@ -136,7 +130,6 @@ void TRACEPOINT(
const char * service_name) const char * service_name)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rcl_service_init, rcl_service_init,
service_handle, service_handle,
node_handle, node_handle,
@ -150,7 +143,6 @@ void TRACEPOINT(
const void * callback) const void * callback)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rclcpp_service_callback_added, rclcpp_service_callback_added,
service_handle, service_handle,
callback); callback);
@ -164,7 +156,6 @@ void TRACEPOINT(
const char * service_name) const char * service_name)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rcl_client_init, rcl_client_init,
client_handle, client_handle,
node_handle, node_handle,
@ -178,7 +169,6 @@ void TRACEPOINT(
int64_t period) int64_t period)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rcl_timer_init, rcl_timer_init,
timer_handle, timer_handle,
period); period);
@ -190,7 +180,6 @@ void TRACEPOINT(
const void * callback) const void * callback)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rclcpp_timer_callback_added, rclcpp_timer_callback_added,
timer_handle, timer_handle,
callback); callback);
@ -202,7 +191,6 @@ void TRACEPOINT(
const char * function_symbol) const char * function_symbol)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
rclcpp_callback_register, rclcpp_callback_register,
callback, callback,
function_symbol); function_symbol);
@ -214,7 +202,6 @@ void TRACEPOINT(
const bool is_intra_process) const bool is_intra_process)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
callback_start, callback_start,
callback, callback,
(is_intra_process ? 1 : 0)); (is_intra_process ? 1 : 0));
@ -225,7 +212,6 @@ void TRACEPOINT(
const void * callback) const void * callback)
{ {
CONDITIONAL_TP( CONDITIONAL_TP(
ros2,
callback_end, callback_end,
callback); callback);
} }