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

Fix tracepoints arguments

Browse source
This commit is contained in:
Christophe Bedard 2019-05-20 13:58:06 +02:00
parent f7fc7f773c
commit a97c980a97
3 changed files with 56 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tracetools/include/tracetools/tracetools.h
View file

@ -30,25 +30,29 @@ void TRACEPOINT(
*/ */
void TRACEPOINT( void TRACEPOINT(
rcl_node_init, rcl_node_init,
const void * node_handle,
const void * rmw_handle,
const char * node_name, const char * node_name,
const char * node_namespace, const char * node_namespace);
const void * rmw_handle);
/** /**
* tp: rcl_publisher_init * tp: rcl_publisher_init
*/ */
void TRACEPOINT( void TRACEPOINT(
rcl_publisher_init, rcl_publisher_init,
const char * node_name, const void * node_handle,
const char * node_namespace); const void * rmw_handle,
const void * publisher_handle,
const char * topic_name);
/** /**
* tp: rcl_subscription_init * tp: rcl_subscription_init
*/ */
void TRACEPOINT( void TRACEPOINT(
rcl_subscription_init, rcl_subscription_init,
const void * node_handle,
const void * rmw_handle,
const void * subscription_handle, const void * subscription_handle,
const char * node_name,
const char * topic_name); const char * topic_name);
/** /**
@ -79,8 +83,9 @@ void TRACEPOINT(
*/ */
void TRACEPOINT( void TRACEPOINT(
rcl_service_init, rcl_service_init,
const void * service, const void * node_handle,
const void * node, const void * rmw_handle,
const void * service_handle,
const char * service_name); const char * service_name);
/** /**
@ -88,7 +93,7 @@ void TRACEPOINT(
*/ */
void TRACEPOINT( void TRACEPOINT(
rclcpp_service_callback_added, rclcpp_service_callback_added,
const void * service, const void * service_handle,
const void * callback); const void * callback);
/** /**

40
tracetools/lttng/tp_call.tp
View file

@ -15,14 +15,16 @@ TRACEPOINT_EVENT(
ros2, ros2,
rcl_node_init, rcl_node_init,
TP_ARGS( TP_ARGS(
const void*, node_handle_arg,
const void*, rmw_handle_arg,
const char*, node_name_arg, const char*, node_name_arg,
const char*, namespace_arg, const char*, namespace_arg
const void*, rmw_handle_arg
), ),
TP_FIELDS( TP_FIELDS(
ctf_integer_hex(const void*, node_handle, node_handle_arg)
ctf_integer_hex(const void*, rmw_handle, rmw_handle_arg)
ctf_string(node_name, node_name_arg) ctf_string(node_name, node_name_arg)
ctf_string(namespace, namespace_arg) ctf_string(namespace, namespace_arg)
ctf_integer_hex(const void*, rmw_handle, rmw_handle_arg)
) )
) )
@ -30,12 +32,16 @@ TRACEPOINT_EVENT(
ros2, ros2,
rcl_publisher_init, rcl_publisher_init,
TP_ARGS( TP_ARGS(
const char*, node_name_arg, const void*, node_handle_arg,
const char*, namespace_arg const void*, rmw_handle_arg,
const void*, publisher_handle_arg,
const char*, topic_name_arg
), ),
TP_FIELDS( TP_FIELDS(
ctf_string(node_name, node_name_arg) ctf_integer_hex(const void*, node_handle, node_handle_arg)
ctf_string(namespace, namespace_arg) ctf_integer_hex(const void*, rmw_handle, rmw_handle_arg)
ctf_integer_hex(const void*, publisher_handle, publisher_handle_arg)
ctf_string(topic_name, topic_name_arg)
) )
) )
@ -43,13 +49,15 @@ TRACEPOINT_EVENT(
ros2, ros2,
rcl_subscription_init, rcl_subscription_init,
TP_ARGS( TP_ARGS(
const void*, node_handle_arg,
const void*, rmw_handle_arg,
const void*, subscription_handle_arg, const void*, subscription_handle_arg,
const char*, node_name_arg,
const char*, topic_name_arg const char*, topic_name_arg
), ),
TP_FIELDS( TP_FIELDS(
ctf_integer_hex(const void*, node_handle, node_handle_arg)
ctf_integer_hex(const void*, rmw_handle, rmw_handle_arg)
ctf_integer_hex(const void*, subscription_handle, subscription_handle_arg) ctf_integer_hex(const void*, subscription_handle, subscription_handle_arg)
ctf_string(node_name, node_name_arg)
ctf_string(topic_name, topic_name_arg) ctf_string(topic_name, topic_name_arg)
) )
) )
@ -95,13 +103,15 @@ TRACEPOINT_EVENT(
ros2, ros2,
rcl_service_init, rcl_service_init,
TP_ARGS( TP_ARGS(
const void*, service_arg, const void*, node_handle_arg,
const void*, node_arg, const void*, rmw_handle_arg,
const void*, service_handle_arg,
const char*, service_name_arg const char*, service_name_arg
), ),
TP_FIELDS( TP_FIELDS(
ctf_integer_hex(const void*, service, service_arg) ctf_integer_hex(const void*, node_handle, node_handle_arg)
ctf_integer_hex(const void*, node, node_arg) ctf_integer_hex(const void*, rmw_handle, rmw_handle_arg)
ctf_integer_hex(const void*, service_handle, service_handle_arg)
ctf_string(service_name, service_name_arg) ctf_string(service_name, service_name_arg)
) )
) )
@ -110,11 +120,11 @@ TRACEPOINT_EVENT(
ros2, ros2,
rclcpp_service_callback_added, rclcpp_service_callback_added,
TP_ARGS( TP_ARGS(
const void*, service_arg, const void*, service_handle_arg,
const void*, callback_arg const void*, callback_arg
), ),
TP_FIELDS( TP_FIELDS(
ctf_integer_hex(const void*, service, service_arg) ctf_integer_hex(const void*, service_handle, service_handle_arg)
ctf_integer_hex(const void*, callback, callback_arg) ctf_integer_hex(const void*, callback, callback_arg)
) )
) )

31
tracetools/src/tracetools.c
View file

@ -27,28 +27,32 @@ void TRACEPOINT(
void TRACEPOINT( void TRACEPOINT(
rcl_node_init, rcl_node_init,
const void * node_handle,
const void * rmw_handle,
const char * node_name, const char * node_name,
const char * node_namespace, const char * node_namespace)
const void * rmw_handle)
{ {
CONDITIONAL_TP(ros2, rcl_node_init, node_name, node_namespace, rmw_handle); CONDITIONAL_TP(ros2, rcl_node_init, node_handle, rmw_handle, node_name, node_namespace);
} }
void TRACEPOINT( void TRACEPOINT(
rcl_publisher_init, rcl_publisher_init,
const char * node_name, const void * node_handle,
const char * node_namespace) const void * rmw_handle,
const void * publisher_handle,
const char * topic_name)
{ {
CONDITIONAL_TP(ros2, rcl_publisher_init, node_name, node_namespace); CONDITIONAL_TP(ros2, rcl_publisher_init, node_handle, rmw_handle, publisher_handle, topic_name);
} }
void TRACEPOINT( void TRACEPOINT(
rcl_subscription_init, rcl_subscription_init,
const void * node_handle,
const void * rmw_handle,
const void * subscription_handle, const void * subscription_handle,
const char * node_name,
const char * topic_name) const char * topic_name)
{ {
CONDITIONAL_TP(ros2, rcl_subscription_init, subscription_handle, node_name, topic_name); CONDITIONAL_TP(ros2, rcl_subscription_init, node_handle, rmw_handle, subscription_handle, topic_name);
} }
void TRACEPOINT( void TRACEPOINT(
@ -76,19 +80,20 @@ void TRACEPOINT(
void TRACEPOINT( void TRACEPOINT(
rcl_service_init, rcl_service_init,
const void * service, const void * node_handle,
const void * node, const void * rmw_handle,
const void * service_handle,
const char * service_name) const char * service_name)
{ {
CONDITIONAL_TP(ros2, rcl_service_init, service, node, service_name); CONDITIONAL_TP(ros2, rcl_service_init, node_handle, rmw_handle, service_handle, service_name);
} }
void TRACEPOINT( void TRACEPOINT(
rclcpp_service_callback_added, rclcpp_service_callback_added,
const void * service, const void * service_handle,
const void * callback) const void * callback)
{ {
CONDITIONAL_TP(ros2, rclcpp_service_callback_added, service, callback); CONDITIONAL_TP(ros2, rclcpp_service_callback_added, service_handle, callback);
} }
void TRACEPOINT( void TRACEPOINT(