From 7e215289d71f44f307f23a6285364989eb113f0e Mon Sep 17 00:00:00 2001
From: Christophe Bedard <bedard.christophe@gmail.com>
Date: Fri, 17 May 2019 09:03:03 +0200
Subject: [PATCH] Add rmw_handle to rcl_*_init tracepoint params

---
 tracetools/include/tracetools/tracetools.h | 4 ++--
 tracetools/lttng/tp_call.tp                | 4 +++-
 tracetools/src/tracetools.c                | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tracetools/include/tracetools/tracetools.h b/tracetools/include/tracetools/tracetools.h
index fc4896e..bc7060a 100644
--- a/tracetools/include/tracetools/tracetools.h
+++ b/tracetools/include/tracetools/tracetools.h
@@ -26,12 +26,12 @@ void ros_trace_rcl_init();
 /**
  * tp: rcl_node_init
  */
-void ros_trace_rcl_node_init(const char * node_name, const char * namespace);
+void ros_trace_rcl_node_init(const char * node_name, const char * node_namespace, const void * rmw_handle);
 
 /**
  * tp: rcl_publisher_init
  */
-void ros_trace_rcl_publisher_init(const char * node_name, const char * namespace);
+void ros_trace_rcl_publisher_init(const char * node_name, const char * node_namespace);
 
 /**
  * tp: rcl_subscription_init
diff --git a/tracetools/lttng/tp_call.tp b/tracetools/lttng/tp_call.tp
index 0d0aa4c..c02e6d9 100644
--- a/tracetools/lttng/tp_call.tp
+++ b/tracetools/lttng/tp_call.tp
@@ -14,11 +14,13 @@ TRACEPOINT_EVENT(
     rcl_node_init,
     TP_ARGS(
         const char*, node_name_arg,
-        const char*, namespace_arg
+        const char*, namespace_arg,
+        const void*, rmw_handle_arg
     ),
     TP_FIELDS(
         ctf_string(node_name, node_name_arg)
         ctf_string(namespace, namespace_arg)
+        ctf_integer_hex(const void*, rmw_handle, rmw_handle_arg)
     )
 )
 
diff --git a/tracetools/src/tracetools.c b/tracetools/src/tracetools.c
index 5efcaed..a48b9a9 100644
--- a/tracetools/src/tracetools.c
+++ b/tracetools/src/tracetools.c
@@ -21,17 +21,17 @@ void ros_trace_rcl_init()
 #endif
 }
 
-void ros_trace_rcl_node_init(const char * node_name, const char * namespace)
+void ros_trace_rcl_node_init(const char * node_name, const char * node_namespace, const void * rmw_handle)
 {
 #ifdef WITH_LTTNG
-  tracepoint(ros2, rcl_node_init, node_name, namespace);
+  tracepoint(ros2, rcl_node_init, node_name, node_namespace, rmw_handle);
 #endif
 }
 
-void ros_trace_rcl_publisher_init(const char * node_name, const char * namespace)
+void ros_trace_rcl_publisher_init(const char * node_name, const char * node_namespace)
 {
 #ifdef WITH_LTTNG
-  tracepoint(ros2, rcl_publisher_init, node_name, namespace);
+  tracepoint(ros2, rcl_publisher_init, node_name, node_namespace);
 #endif
 }