From b09f72081c5692f02669f81153c2ae1db1099925 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <bedard.christophe@gmail.com>
Date: Fri, 17 May 2019 14:59:31 +0200
Subject: [PATCH] Add *subscription_callback_added and link subscription_handle
 to rcl_subscription_init

---
 tracetools/include/tracetools/tracetools.h |  9 +++++++++
 tracetools/lttng/tp_call.tp                | 15 +++++++++++++++
 tracetools/src/tracetools.c                | 11 ++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/tracetools/include/tracetools/tracetools.h b/tracetools/include/tracetools/tracetools.h
index 620de75..81517e7 100644
--- a/tracetools/include/tracetools/tracetools.h
+++ b/tracetools/include/tracetools/tracetools.h
@@ -45,9 +45,18 @@ void TRACEPOINT(
  */
 void TRACEPOINT(
     rcl_subscription_init,
+    const void * subscription_handle,
     const char * node_name,
     const char * topic_name);
 
+/**
+ * tp: rclcpp_subscription_callback_added
+ */
+void TRACEPOINT(
+    rclcpp_subscription_callback_added,
+    const void * subscription_handle,
+    const void * callback);
+
 /**
  * tp: rclcpp_subscription_callback_start
  */
diff --git a/tracetools/lttng/tp_call.tp b/tracetools/lttng/tp_call.tp
index c3bd7a1..b23e101 100644
--- a/tracetools/lttng/tp_call.tp
+++ b/tracetools/lttng/tp_call.tp
@@ -41,15 +41,30 @@ TRACEPOINT_EVENT(
     ros2,
     rcl_subscription_init,
     TP_ARGS(
+        const void*, subscription_handle_arg,
         const char*, node_name_arg,
         const char*, topic_name_arg
     ),
     TP_FIELDS(
+        ctf_integer_hex(const void*, subscription_handle, subscription_handle_arg)
         ctf_string(node_name, node_name_arg)
         ctf_string(topic_name, topic_name_arg)
     )
 )
 
+TRACEPOINT_EVENT(
+    ros2,
+    rclcpp_subscription_callback_added,
+    TP_ARGS(
+        const void*, subscription_handle_arg,
+        const void*, callback_arg
+    ),
+    TP_FIELDS(
+        ctf_integer_hex(const void*, subscription_handle, subscription_handle_arg)
+        ctf_integer_hex(const void*, callback, callback_arg)
+    )
+)
+
 TRACEPOINT_EVENT(
     ros2,
     rclcpp_subscription_callback_start,
diff --git a/tracetools/src/tracetools.c b/tracetools/src/tracetools.c
index c98e7fd..b78af20 100644
--- a/tracetools/src/tracetools.c
+++ b/tracetools/src/tracetools.c
@@ -42,10 +42,19 @@ void TRACEPOINT(
 
 void TRACEPOINT(
   rcl_subscription_init,
+  const void * subscription_handle,
   const char * node_name,
   const char * topic_name)
 {
-  CONDITIONAL_TP(ros2, rcl_subscription_init, node_name, topic_name);
+  CONDITIONAL_TP(ros2, rcl_subscription_init, subscription_handle, node_name, topic_name);
+}
+
+void TRACEPOINT(
+    rclcpp_subscription_callback_added,
+    const void * subscription_handle,
+    const void * callback)
+{
+  CONDITIONAL_TP(ros2, rclcpp_subscription_callback_added, subscription_handle, callback);
 }
 
 void TRACEPOINT(