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

Use relevant rmw handle instead of the rmw_node_t handle for tracepoints

Browse source
This commit is contained in:
Christophe Bedard 2019-05-28 14:57:15 +02:00
parent 3f13dd34d0
commit cee1327930
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tracetools/include/tracetools/tracetools.h
View file

@ -41,8 +41,8 @@ void TRACEPOINT(
void TRACEPOINT( void TRACEPOINT(
rcl_publisher_init, rcl_publisher_init,
const void * node_handle, const void * node_handle,
const void * rmw_handle,
const void * publisher_handle, const void * publisher_handle,
const void * rmw_publisher_handle,
const char * topic_name, const char * topic_name,
const size_t depth); const size_t depth);
@ -52,8 +52,8 @@ void TRACEPOINT(
void TRACEPOINT( void TRACEPOINT(
rcl_subscription_init, rcl_subscription_init,
const void * node_handle, const void * node_handle,
const void * rmw_handle,
const void * subscription_handle, const void * subscription_handle,
const void * rmw_subscription_handle,
const char * topic_name, const char * topic_name,
const size_t depth); const size_t depth);
@ -86,8 +86,8 @@ void TRACEPOINT(
void TRACEPOINT( void TRACEPOINT(
rcl_service_init, rcl_service_init,
const void * node_handle, const void * node_handle,
const void * rmw_handle,
const void * service_handle, const void * service_handle,
const void * rmw_service_handle,
const char * service_name); const char * service_name);
/** /**

8
tracetools/lttng/tp_call.tp
View file

@ -52,15 +52,15 @@ TRACEPOINT_EVENT(
rcl_subscription_init, rcl_subscription_init,
TP_ARGS( TP_ARGS(
const void *, node_handle_arg, const void *, node_handle_arg,
const void *, rmw_handle_arg,
const void *, subscription_handle_arg, const void *, subscription_handle_arg,
const void *, rmw_subscription_handle_arg,
const char *, topic_name_arg, const char *, topic_name_arg,
const size_t, depth_arg const size_t, depth_arg
), ),
TP_FIELDS( TP_FIELDS(
ctf_integer_hex(const void *, node_handle, node_handle_arg) 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_integer_hex(const void *, rmw_subscription_handle, rmw_subscription_handle_arg)
ctf_string(topic_name, topic_name_arg) ctf_string(topic_name, topic_name_arg)
ctf_integer(const size_t, depth, depth_arg) ctf_integer(const size_t, depth, depth_arg)
) )
@ -108,14 +108,14 @@ TRACEPOINT_EVENT(
rcl_service_init, rcl_service_init,
TP_ARGS( TP_ARGS(
const void *, node_handle_arg, const void *, node_handle_arg,
const void *, rmw_handle_arg,
const void *, service_handle_arg, const void *, service_handle_arg,
const void *, rmw_service_handle_arg,
const char *, service_name_arg const char *, service_name_arg
), ),
TP_FIELDS( TP_FIELDS(
ctf_integer_hex(const void *, node_handle, node_handle_arg) 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 *, service_handle, service_handle_arg) ctf_integer_hex(const void *, service_handle, service_handle_arg)
ctf_integer_hex(const void *, rmw_service_handle, rmw_service_handle_arg)
ctf_string(service_name, service_name_arg) ctf_string(service_name, service_name_arg)
) )
) )

12
tracetools/src/tracetools.c
View file

@ -50,23 +50,23 @@ void TRACEPOINT(
void TRACEPOINT( void TRACEPOINT(
rcl_publisher_init, rcl_publisher_init,
const void * node_handle, const void * node_handle,
const void * rmw_handle,
const void * publisher_handle, const void * publisher_handle,
const void * rmw_publisher_handle,
const char * topic_name, const char * topic_name,
const size_t depth) const size_t depth)
{ {
CONDITIONAL_TP(ros2, rcl_publisher_init, node_handle, rmw_handle, publisher_handle, topic_name, depth); CONDITIONAL_TP(ros2, rcl_publisher_init, node_handle, publisher_handle, rmw_publisher_handle, topic_name, depth);
} }
void TRACEPOINT( void TRACEPOINT(
rcl_subscription_init, rcl_subscription_init,
const void * node_handle, const void * node_handle,
const void * rmw_handle,
const void * subscription_handle, const void * subscription_handle,
const void * rmw_subscription_handle,
const char * topic_name, const char * topic_name,
const size_t depth) const size_t depth)
{ {
CONDITIONAL_TP(ros2, rcl_subscription_init, node_handle, rmw_handle, subscription_handle, topic_name, depth); CONDITIONAL_TP(ros2, rcl_subscription_init, node_handle, subscription_handle, rmw_subscription_handle, topic_name, depth);
} }
void TRACEPOINT( void TRACEPOINT(
@ -95,11 +95,11 @@ void TRACEPOINT(
void TRACEPOINT( void TRACEPOINT(
rcl_service_init, rcl_service_init,
const void * node_handle, const void * node_handle,
const void * rmw_handle,
const void * service_handle, const void * service_handle,
const void * rmw_service_handle,
const char * service_name) const char * service_name)
{ {
CONDITIONAL_TP(ros2, rcl_service_init, node_handle, rmw_handle, service_handle, service_name); CONDITIONAL_TP(ros2, rcl_service_init, node_handle, service_handle, rmw_service_handle, service_name);
} }
void TRACEPOINT( void TRACEPOINT(