From dd85e2af74338935eabc42deed6fcd178087f2ff Mon Sep 17 00:00:00 2001
From: Christophe Bedard <bedard.christophe@gmail.com>
Date: Fri, 17 May 2019 13:24:21 +0200
Subject: [PATCH] Rename rclcpp_callback_start|end to
 rclcpp_subscription_callback_start|end

---
 tracetools/include/tracetools/tracetools.h | 8 ++++----
 tracetools/lttng/tp_call.tp                | 4 ++--
 tracetools/scripts/setup-lttng.sh          | 4 ++--
 tracetools/src/tracetools.c                | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tracetools/include/tracetools/tracetools.h b/tracetools/include/tracetools/tracetools.h
index b96a8cd..94a7281 100644
--- a/tracetools/include/tracetools/tracetools.h
+++ b/tracetools/include/tracetools/tracetools.h
@@ -39,14 +39,14 @@ void ros_trace_rcl_publisher_init(const char * node_name, const char * node_name
 void ros_trace_rcl_subscription_init(const char * node_name, const char * topic_name);
 
 /**
- * tp: rclcpp_callback_start
+ * tp: rclcpp_subscription_callback_start
  */
-void ros_trace_rclcpp_callback_start(const void * callback, const bool is_intra_process);
+void ros_trace_rclcpp_subscription_callback_start(const void * callback, const bool is_intra_process);
 
 /**
- * tp: rclcpp_callback_end
+ * tp: rclcpp_subscription_callback_end
  */
-void ros_trace_rclcpp_callback_end(const void * callback);
+void ros_trace_rclcpp_subscription_callback_end(const void * callback);
 
 #ifdef __cplusplus
 }
diff --git a/tracetools/lttng/tp_call.tp b/tracetools/lttng/tp_call.tp
index 1f62616..aa4a07b 100644
--- a/tracetools/lttng/tp_call.tp
+++ b/tracetools/lttng/tp_call.tp
@@ -52,7 +52,7 @@ TRACEPOINT_EVENT(
 
 TRACEPOINT_EVENT(
     ros2,
-    rclcpp_callback_start,
+    rclcpp_subscription_callback_start,
     TP_ARGS(
         const void*, callback_arg,
         int, is_intra_process_arg
@@ -65,7 +65,7 @@ TRACEPOINT_EVENT(
 
 TRACEPOINT_EVENT(
     ros2,
-    rclcpp_callback_end,
+    rclcpp_subscription_callback_end,
     TP_ARGS(
         const void*, callback_arg
     ),
diff --git a/tracetools/scripts/setup-lttng.sh b/tracetools/scripts/setup-lttng.sh
index b146a0e..40133da 100755
--- a/tracetools/scripts/setup-lttng.sh
+++ b/tracetools/scripts/setup-lttng.sh
@@ -6,8 +6,8 @@ for event in \
   ros2:rcl_node_init \
   ros2:rcl_publisher_init \
   ros2:rcl_subscription_init \
-  ros2:rclcpp_callback_start \
-  ros2:rclcpp_callback_end
+  ros2:rclcpp_subscription_callback_start \
+  ros2:rclcpp_subscription_callback_end
 do
 	lttng enable-event -c ros2 -u $event
 done
diff --git a/tracetools/src/tracetools.c b/tracetools/src/tracetools.c
index a335318..6d5ba57 100644
--- a/tracetools/src/tracetools.c
+++ b/tracetools/src/tracetools.c
@@ -42,16 +42,16 @@ void ros_trace_rcl_subscription_init(const char * node_name, const char * topic_
 #endif
 }
 
-void ros_trace_rclcpp_callback_start(const void * callback, const bool is_intra_process)
+void ros_trace_rclcpp_subscription_callback_start(const void * callback, const bool is_intra_process)
 {
 #ifdef WITH_LTTNG
-  tracepoint(ros2, rclcpp_callback_start, callback, (is_intra_process ? 1 : 0));
+  tracepoint(ros2, rclcpp_subscription_callback_start, callback, (is_intra_process ? 1 : 0));
 #endif
 }
 
-void ros_trace_rclcpp_callback_end(const void * callback)
+void ros_trace_rclcpp_subscription_callback_end(const void * callback)
 {
 #ifdef WITH_LTTNG
-  tracepoint(ros2, rclcpp_callback_end, callback);
+  tracepoint(ros2, rclcpp_subscription_callback_end, callback);
 #endif
 }
\ No newline at end of file