From 9ae7c8d99c9895aad57616465842b0f297f339b9 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <bedard.christophe@gmail.com>
Date: Fri, 17 May 2019 15:42:30 +0200
Subject: [PATCH] Add context to rcl_init tracepoint params

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

diff --git a/tracetools/include/tracetools/tracetools.h b/tracetools/include/tracetools/tracetools.h
index 81517e7..1e84e11 100644
--- a/tracetools/include/tracetools/tracetools.h
+++ b/tracetools/include/tracetools/tracetools.h
@@ -21,7 +21,9 @@ bool ros_trace_compile_status();
 /**
  * tp: rcl_init
  */
-void TRACEPOINT(rcl_init);
+void TRACEPOINT(
+    rcl_init,
+    const void * context);
 
 /**
  * tp: rcl_node_init
diff --git a/tracetools/lttng/tp_call.tp b/tracetools/lttng/tp_call.tp
index b23e101..b6796f6 100644
--- a/tracetools/lttng/tp_call.tp
+++ b/tracetools/lttng/tp_call.tp
@@ -4,8 +4,10 @@ TRACEPOINT_EVENT(
     ros2,
     rcl_init,
     TP_ARGS(
+        const void*, context_arg
     ),
     TP_FIELDS(
+        ctf_integer_hex(const void*, context, context_arg)
     )
 )
 
diff --git a/tracetools/src/tracetools.c b/tracetools/src/tracetools.c
index b78af20..7509512 100644
--- a/tracetools/src/tracetools.c
+++ b/tracetools/src/tracetools.c
@@ -18,9 +18,11 @@ bool ros_trace_compile_status()
 #endif
 }
 
-void TRACEPOINT(rcl_init)
+void TRACEPOINT(
+  rcl_init,
+  const void * context)
 {
-  CONDITIONAL_TP(ros2, rcl_init);
+  CONDITIONAL_TP(ros2, rcl_init, context);
 }
 
 void TRACEPOINT(