From cee1327930b66affa665d17aec7ae496c4026cb5 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <bedard.christophe@gmail.com>
Date: Tue, 28 May 2019 14:57:15 +0200
Subject: [PATCH] Use relevant rmw handle instead of the rmw_node_t handle for
 tracepoints

---
 tracetools/include/tracetools/tracetools.h |  6 +++---
 tracetools/lttng/tp_call.tp                |  8 ++++----
 tracetools/src/tracetools.c                | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tracetools/include/tracetools/tracetools.h b/tracetools/include/tracetools/tracetools.h
index 769fc04..fe040a2 100644
--- a/tracetools/include/tracetools/tracetools.h
+++ b/tracetools/include/tracetools/tracetools.h
@@ -41,8 +41,8 @@ void TRACEPOINT(
 void TRACEPOINT(
   rcl_publisher_init,
   const void * node_handle,
-  const void * rmw_handle,
   const void * publisher_handle,
+  const void * rmw_publisher_handle,
   const char * topic_name,
   const size_t depth);
 
@@ -52,8 +52,8 @@ void TRACEPOINT(
 void TRACEPOINT(
   rcl_subscription_init,
   const void * node_handle,
-  const void * rmw_handle,
   const void * subscription_handle,
+  const void * rmw_subscription_handle,
   const char * topic_name,
   const size_t depth);
 
@@ -86,8 +86,8 @@ void TRACEPOINT(
 void TRACEPOINT(
   rcl_service_init,
   const void * node_handle,
-  const void * rmw_handle,
   const void * service_handle,
+  const void * rmw_service_handle,
   const char * service_name);
 
 /**
diff --git a/tracetools/lttng/tp_call.tp b/tracetools/lttng/tp_call.tp
index 9750000..1a833c9 100644
--- a/tracetools/lttng/tp_call.tp
+++ b/tracetools/lttng/tp_call.tp
@@ -52,15 +52,15 @@ TRACEPOINT_EVENT(
     rcl_subscription_init,
     TP_ARGS(
         const void *, node_handle_arg,
-        const void *, rmw_handle_arg,
         const void *, subscription_handle_arg,
+        const void *, rmw_subscription_handle_arg,
         const char *, topic_name_arg,
         const size_t, depth_arg
     ),
     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 *, rmw_subscription_handle, rmw_subscription_handle_arg)
         ctf_string(topic_name, topic_name_arg)
         ctf_integer(const size_t, depth, depth_arg)
     )
@@ -108,14 +108,14 @@ TRACEPOINT_EVENT(
     rcl_service_init,
     TP_ARGS(
         const void *, node_handle_arg,
-        const void *, rmw_handle_arg,
         const void *, service_handle_arg,
+        const void *, rmw_service_handle_arg,
         const char *, service_name_arg
     ),
     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 *, service_handle, service_handle_arg)
+        ctf_integer_hex(const void *, rmw_service_handle, rmw_service_handle_arg)
         ctf_string(service_name, service_name_arg)
     )
 )
diff --git a/tracetools/src/tracetools.c b/tracetools/src/tracetools.c
index 7044c55..dea60bc 100644
--- a/tracetools/src/tracetools.c
+++ b/tracetools/src/tracetools.c
@@ -50,23 +50,23 @@ void TRACEPOINT(
 void TRACEPOINT(
   rcl_publisher_init,
   const void * node_handle,
-  const void * rmw_handle,
   const void * publisher_handle,
+  const void * rmw_publisher_handle,
   const char * topic_name,
   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(
   rcl_subscription_init,
   const void * node_handle,
-  const void * rmw_handle,
   const void * subscription_handle,
+  const void * rmw_subscription_handle,
   const char * topic_name,
   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(
@@ -95,11 +95,11 @@ void TRACEPOINT(
 void TRACEPOINT(
   rcl_service_init,
   const void * node_handle,
-  const void * rmw_handle,
   const void * service_handle,
+  const void * rmw_service_handle,
   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(