Fix linting errors

tracetools/.gitignore

@@ -1 +1,5 @@
 traces/
+
+# generated files (LTTng)
+tp_call.c
+tp_call.h

tracetools/CMakeLists.txt

@@ -21,13 +21,13 @@ endif()
 if(LTTNG_FOUND)
   # Generate necessary LTTng files
   # If successful, enable tracing
-  add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/src/tp_call.c
+  add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/src/tp_call.c ${PROJECT_SOURCE_DIR}/include/tp_call.h
-    COMMAND lttng-gen-tp tp_call.tp -o ../src/tp_call.c -o ../src/tp_call.h
+    COMMAND lttng-gen-tp tp_call.tp -o tp_call.c -o ../include/tp_call.h
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/lttng
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src
-    DEPENDS ${PROJECT_SOURCE_DIR}/lttng/tp_call.tp
+    DEPENDS ${PROJECT_SOURCE_DIR}/src/tp_call.tp
   )
   set(LTTNG_GENERATED
-    src/tp_call.h
+    include/tp_call.h
     src/tp_call.c
   )
   set(TRACING_ENABLED TRUE)

tracetools/include/tracetools/tracetools.h

@@ -1,5 +1,5 @@
-#ifndef __TRACETOOLS_TRACETOOLS_H_
+#ifndef TRACETOOLS__TRACETOOLS_H_
-#define __TRACETOOLS_TRACETOOLS_H_
+#define TRACETOOLS__TRACETOOLS_H_
 
 #include <stdint.h>
 #include <string.h>
@@ -128,7 +128,7 @@ void TRACEPOINT(
 void TRACEPOINT(
   rcl_timer_init,
   const void * timer_handle,
-  long period);
+  int64_t period);
 
 /**
  * tp: rclcpp_timer_callback_added
@@ -164,4 +164,4 @@ void TRACEPOINT(
 }
 #endif
 
-#endif /* __TRACETOOLS_TRACETOOLS_H_ */
+#endif /* TRACETOOLS__TRACETOOLS_H_ */

tracetools/include/tracetools/utils.hpp

@@ -1,10 +1,12 @@
-#ifndef __TRACETOOLS_UTILS_H_
+#ifndef TRACETOOLS__UTILS_HPP_
-#define __TRACETOOLS_UTILS_H_
+#define TRACETOOLS__UTILS_HPP_
 
 #include <stddef.h>
+#include <functional>
 
 template<typename T, typename ... U>
-size_t get_address(std::function<T(U...)> f) {
+size_t get_address(std::function<T(U...)> f)
+{
   typedef T (fnType)(U...);
   fnType ** fnPointer = f.template target<fnType *>();
   // Might be a lambda
@@ -16,4 +18,4 @@ size_t get_address(std::function<T(U...)> f) {
 
 const char * get_symbol(void * funptr);
 
-#endif /* __TRACETOOLS_UTILS_H_ */
+#endif  // TRACETOOLS__UTILS_HPP_

tracetools/lttng/tp_call.tp

@@ -1,234 +0,0 @@
-#include <stdint.h>
-
-TRACEPOINT_EVENT(
-    ros2,
-    rcl_init,
-    TP_ARGS(
-        const void *, context_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, context, context_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rcl_node_init,
-    TP_ARGS(
-        const void *, node_handle_arg,
-        const void *, rmw_handle_arg,
-        const char *, node_name_arg,
-        const char *, namespace_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, node_handle, node_handle_arg)
-        ctf_integer_hex(const void *, rmw_handle, rmw_handle_arg)
-        ctf_string(node_name, node_name_arg)
-        ctf_string(namespace, namespace_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rcl_publisher_init,
-    TP_ARGS(
-        const void *, node_handle_arg,
-        const void *, rmw_handle_arg,
-        const void *, publisher_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 *, publisher_handle, publisher_handle_arg)
-        ctf_string(topic_name, topic_name_arg)
-        ctf_integer(const size_t, depth, depth_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rcl_subscription_init,
-    TP_ARGS(
-        const void *, node_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 *, 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)
-    )
-)
-
-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,
-    TP_ARGS(
-        const void *, callback_arg,
-        int, is_intra_process_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, callback, callback_arg)
-        ctf_integer(int, is_intra_process, is_intra_process_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rclcpp_subscription_callback_end,
-    TP_ARGS(
-        const void *, callback_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, callback, callback_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rcl_service_init,
-    TP_ARGS(
-        const void *, node_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 *, service_handle, service_handle_arg)
-        ctf_integer_hex(const void *, rmw_service_handle, rmw_service_handle_arg)
-        ctf_string(service_name, service_name_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rclcpp_service_callback_added,
-    TP_ARGS(
-        const void *, service_handle_arg,
-        const void *, callback_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, service_handle, service_handle_arg)
-        ctf_integer_hex(const void *, callback, callback_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rclcpp_service_callback_start,
-    TP_ARGS(
-        const void *, callback_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, callback, callback_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rclcpp_service_callback_end,
-    TP_ARGS(
-        const void *, callback_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, callback, callback_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rcl_client_init,
-    TP_ARGS(
-        const void *, node_handle_arg,
-        const void *, client_handle_arg,
-        const void *, rmw_client_handle_arg,
-        const char *, service_name_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, node_handle, node_handle_arg)
-        ctf_integer_hex(const void *, client_handle, client_handle_arg)
-        ctf_integer_hex(const void *, rmw_client_handle, rmw_client_handle_arg)
-        ctf_string(service_name, service_name_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rcl_timer_init,
-    TP_ARGS(
-        const void *, timer_handle_arg,
-        long, period_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, timer_handle, timer_handle_arg)
-        ctf_integer(long, period, period_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rclcpp_timer_callback_added,
-    TP_ARGS(
-        const void *, timer_handle_arg,
-        const void *, callback_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, timer_handle, timer_handle_arg)
-        ctf_integer_hex(const void *, callback, callback_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rclcpp_timer_callback_start,
-    TP_ARGS(
-        const void *, callback_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, callback, callback_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rclcpp_timer_callback_end,
-    TP_ARGS(
-        const void *, callback_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, callback, callback_arg)
-    )
-)
-
-TRACEPOINT_EVENT(
-    ros2,
-    rclcpp_callback_register,
-    TP_ARGS(
-        const void *, callback_arg,
-        const char *, symbol_arg
-    ),
-    TP_FIELDS(
-        ctf_integer_hex(const void *, callback, callback_arg)
-        ctf_string(symbol, symbol_arg)
-    )
-)

tracetools/package.xml

@@ -5,9 +5,9 @@
   <version>0.0.1</version>
   <description>ROS 2 wrapper for instrumentation</description>
   <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
+  <license>APLv2</license>
   <author email="ingo.luetkebohle@de.bosch.com">Ingo Luetkebohle</author>
   <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
-  <license>APLv2</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>pkg-config</buildtool_depend>

tracetools/src/.gitignore

@@ -1,3 +0,0 @@
-# generated files (LTTng)
-tp_call.c
-tp_call.h

tracetools/src/tp_call.tp

@@ -0,0 +1,234 @@
+#include <stdint.h>
+
+TRACEPOINT_EVENT(
+  ros2,
+  rcl_init,
+  TP_ARGS(
+    const void *, context_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, context, context_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rcl_node_init,
+  TP_ARGS(
+    const void *, node_handle_arg,
+    const void *, rmw_handle_arg,
+    const char *, node_name_arg,
+    const char *, namespace_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, node_handle, node_handle_arg)
+    ctf_integer_hex(const void *, rmw_handle, rmw_handle_arg)
+    ctf_string(node_name, node_name_arg)
+    ctf_string(namespace, namespace_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rcl_publisher_init,
+  TP_ARGS(
+    const void *, node_handle_arg,
+    const void *, rmw_handle_arg,
+    const void *, publisher_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 *, publisher_handle, publisher_handle_arg)
+    ctf_string(topic_name, topic_name_arg)
+    ctf_integer(const size_t, depth, depth_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rcl_subscription_init,
+  TP_ARGS(
+    const void *, node_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 *, 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)
+  )
+)
+
+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,
+  TP_ARGS(
+    const void *, callback_arg,
+    int, is_intra_process_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, callback, callback_arg)
+    ctf_integer(int, is_intra_process, is_intra_process_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rclcpp_subscription_callback_end,
+  TP_ARGS(
+    const void *, callback_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, callback, callback_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rcl_service_init,
+  TP_ARGS(
+    const void *, node_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 *, service_handle, service_handle_arg)
+    ctf_integer_hex(const void *, rmw_service_handle, rmw_service_handle_arg)
+    ctf_string(service_name, service_name_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rclcpp_service_callback_added,
+  TP_ARGS(
+    const void *, service_handle_arg,
+    const void *, callback_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, service_handle, service_handle_arg)
+    ctf_integer_hex(const void *, callback, callback_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rclcpp_service_callback_start,
+  TP_ARGS(
+    const void *, callback_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, callback, callback_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rclcpp_service_callback_end,
+  TP_ARGS(
+    const void *, callback_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, callback, callback_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rcl_client_init,
+  TP_ARGS(
+    const void *, node_handle_arg,
+    const void *, client_handle_arg,
+    const void *, rmw_client_handle_arg,
+    const char *, service_name_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, node_handle, node_handle_arg)
+    ctf_integer_hex(const void *, client_handle, client_handle_arg)
+    ctf_integer_hex(const void *, rmw_client_handle, rmw_client_handle_arg)
+    ctf_string(service_name, service_name_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rcl_timer_init,
+  TP_ARGS(
+    const void *, timer_handle_arg,
+    int64_t, period_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, timer_handle, timer_handle_arg)
+    ctf_integer(int64_t, period, period_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rclcpp_timer_callback_added,
+  TP_ARGS(
+    const void *, timer_handle_arg,
+    const void *, callback_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, timer_handle, timer_handle_arg)
+    ctf_integer_hex(const void *, callback, callback_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rclcpp_timer_callback_start,
+  TP_ARGS(
+    const void *, callback_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, callback, callback_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rclcpp_timer_callback_end,
+  TP_ARGS(
+    const void *, callback_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, callback, callback_arg)
+  )
+)
+
+TRACEPOINT_EVENT(
+  ros2,
+  rclcpp_callback_register,
+  TP_ARGS(
+    const void *, callback_arg,
+    const char *, symbol_arg
+  ),
+  TP_FIELDS(
+    ctf_integer_hex(const void *, callback, callback_arg)
+    ctf_string(symbol, symbol_arg)
+  )
+)

tracetools/src/tracetools.c

@@ -21,7 +21,10 @@ void TRACEPOINT(
   rcl_init,
   const void * context)
 {
-  CONDITIONAL_TP(ros2, rcl_init, context);
+  CONDITIONAL_TP(
+    ros2,
+    rcl_init,
+    context);
 }
 
 void TRACEPOINT(
@@ -31,7 +34,13 @@ void TRACEPOINT(
   const char * node_name,
   const char * node_namespace)
 {
-  CONDITIONAL_TP(ros2, rcl_node_init, node_handle, rmw_handle, node_name, node_namespace);
+  CONDITIONAL_TP(
+    ros2,
+    rcl_node_init,
+    node_handle,
+    rmw_handle,
+    node_name,
+    node_namespace);
 }
 
 void TRACEPOINT(
@@ -42,7 +51,14 @@ void TRACEPOINT(
   const char * topic_name,
   const size_t depth)
 {
-  CONDITIONAL_TP(ros2, rcl_publisher_init, node_handle, publisher_handle, rmw_publisher_handle, topic_name, depth);
+  CONDITIONAL_TP(
+    ros2,
+    rcl_publisher_init,
+    node_handle,
+    publisher_handle,
+    rmw_publisher_handle,
+    topic_name,
+    depth);
 }
 
 void TRACEPOINT(
@@ -53,7 +69,14 @@ void TRACEPOINT(
   const char * topic_name,
   const size_t depth)
 {
-  CONDITIONAL_TP(ros2, rcl_subscription_init, node_handle, subscription_handle, rmw_subscription_handle, topic_name, depth);
+  CONDITIONAL_TP(
+    ros2,
+    rcl_subscription_init,
+    node_handle,
+    subscription_handle,
+    rmw_subscription_handle,
+    topic_name,
+    depth);
 }
 
 void TRACEPOINT(
@@ -61,7 +84,11 @@ void TRACEPOINT(
   const void * subscription_handle,
   const void * callback)
 {
-  CONDITIONAL_TP(ros2, rclcpp_subscription_callback_added, subscription_handle, callback);
+  CONDITIONAL_TP(
+    ros2,
+    rclcpp_subscription_callback_added,
+    subscription_handle,
+    callback);
 }
 
 void TRACEPOINT(
@@ -69,14 +96,21 @@ void TRACEPOINT(
   const void * callback,
   const bool is_intra_process)
 {
-  CONDITIONAL_TP(ros2, rclcpp_subscription_callback_start, callback, (is_intra_process ? 1 : 0));
+  CONDITIONAL_TP(
+    ros2,
+    rclcpp_subscription_callback_start,
+    callback,
+    (is_intra_process ? 1 : 0));
 }
 
 void TRACEPOINT(
   rclcpp_subscription_callback_end,
   const void * callback)
 {
-  CONDITIONAL_TP(ros2, rclcpp_subscription_callback_end, callback);
+  CONDITIONAL_TP(
+    ros2,
+    rclcpp_subscription_callback_end,
+    callback);
 }
 
 void TRACEPOINT(
@@ -86,7 +120,13 @@ void TRACEPOINT(
   const void * rmw_service_handle,
   const char * service_name)
 {
-  CONDITIONAL_TP(ros2, rcl_service_init, node_handle, service_handle, rmw_service_handle, service_name);
+  CONDITIONAL_TP(
+    ros2,
+    rcl_service_init,
+    node_handle,
+    service_handle,
+    rmw_service_handle,
+    service_name);
 }
 
 void TRACEPOINT(
@@ -94,21 +134,31 @@ void TRACEPOINT(
   const void * service_handle,
   const void * callback)
 {
-  CONDITIONAL_TP(ros2, rclcpp_service_callback_added, service_handle, callback);
+  CONDITIONAL_TP(
+    ros2,
+    rclcpp_service_callback_added,
+    service_handle,
+    callback);
 }
 
 void TRACEPOINT(
   rclcpp_service_callback_start,
   const void * callback)
 {
-  CONDITIONAL_TP(ros2, rclcpp_service_callback_start, callback);
+  CONDITIONAL_TP(
+    ros2,
+    rclcpp_service_callback_start,
+    callback);
 }
 
 void TRACEPOINT(
   rclcpp_service_callback_end,
   const void * callback)
 {
-  CONDITIONAL_TP(ros2, rclcpp_service_callback_end, callback);
+  CONDITIONAL_TP(
+    ros2,
+    rclcpp_service_callback_end,
+    callback);
 }
 
 void TRACEPOINT(
@@ -118,15 +168,25 @@ void TRACEPOINT(
   const void * rmw_client_handle,
   const char * service_name)
 {
-  CONDITIONAL_TP(ros2, rcl_client_init, node_handle, client_handle, rmw_client_handle, service_name);
+  CONDITIONAL_TP(
+    ros2,
+    rcl_client_init,
+    node_handle,
+    client_handle,
+    rmw_client_handle,
+    service_name);
 }
 
 void TRACEPOINT(
   rcl_timer_init,
   const void * timer_handle,
-  long period)
+  int64_t period)
 {
-  CONDITIONAL_TP(ros2, rcl_timer_init, timer_handle, period);
+  CONDITIONAL_TP(
+    ros2,
+    rcl_timer_init,
+    timer_handle,
+    period);
 }
 
 void TRACEPOINT(
@@ -134,21 +194,31 @@ void TRACEPOINT(
   const void * timer_handle,
   const void * callback)
 {
-  CONDITIONAL_TP(ros2, rclcpp_timer_callback_added, timer_handle, callback);
+  CONDITIONAL_TP(
+    ros2,
+    rclcpp_timer_callback_added,
+    timer_handle,
+    callback);
 }
 
 void TRACEPOINT(
   rclcpp_timer_callback_start,
   const void * callback)
 {
-  CONDITIONAL_TP(ros2, rclcpp_timer_callback_start, callback);
+  CONDITIONAL_TP(
+    ros2,
+    rclcpp_timer_callback_start,
+    callback);
 }
 
 void TRACEPOINT(
   rclcpp_timer_callback_end,
   const void * callback)
 {
-  CONDITIONAL_TP(ros2, rclcpp_timer_callback_end, callback);
+  CONDITIONAL_TP(
+    ros2,
+    rclcpp_timer_callback_end,
+    callback);
 }
 
 void TRACEPOINT(
@@ -156,5 +226,9 @@ void TRACEPOINT(
   const void * callback,
   const char * function_symbol)
 {
-  CONDITIONAL_TP(ros2, rclcpp_callback_register, callback, function_symbol);
+  CONDITIONAL_TP(
+    ros2,
+    rclcpp_callback_register,
+    callback,
+    function_symbol);
 }

tracetools/src/utils.cpp

@@ -2,8 +2,10 @@
 #include <dlfcn.h>
 #include <cxxabi.h>
 #endif
+#include "tracetools/utils.hpp"
 
-const char * get_symbol(void * funptr) {
+const char * get_symbol(void * funptr)
+{
 #define SYMBOL_UNKNOWN "UNKNOWN"
 #if defined(WITH_LTTNG) && !defined(_WIN32)
 #define SYMBOL_LAMBDA "[lambda]"
@@ -21,7 +23,7 @@ const char * get_symbol(void * funptr) {
   demangled = abi::__cxa_demangle(info.dli_sname, NULL, 0, &status);
   // Use demangled symbol if possible
   const char * demangled_val = (status == 0 ? demangled : info.dli_sname);
-    return (demangled_val != 0 ? demangled_val : SYMBOL_UNKNOWN);
+  return demangled_val != 0 ? demangled_val : SYMBOL_UNKNOWN;
 #else
   return SYMBOL_UNKNOWN;
 #endif

tracetools_test/package.xml

@@ -5,8 +5,8 @@
   <version>0.0.1</version>
   <description>Separate test package for tracetools</description>
   <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
-  <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
   <license>APLv2</license>
+  <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>pkg-config</buildtool_depend>

tracetools_test/src/test_ping.cpp

@@ -6,11 +6,11 @@
 
 using namespace std::chrono_literals;
 
-
 class PingNode : public rclcpp::Node
 {
 public:
-    PingNode(rclcpp::NodeOptions options) : Node("ping_node", options)
+  explicit PingNode(rclcpp::NodeOptions options)
+  : Node("ping_node", options)
   {
     sub_ = this->create_subscription<std_msgs::msg::String>(
       "pong",
@@ -24,7 +24,6 @@ public:
       std::bind(&PingNode::timer_callback, this));
   }
 
-
 private:
   void callback(const std_msgs::msg::String::SharedPtr msg)
   {

tracetools_test/src/test_pong.cpp

@@ -3,11 +3,11 @@
 #include "rclcpp/rclcpp.hpp"
 #include "std_msgs/msg/string.hpp"
 
-
 class PongNode : public rclcpp::Node
 {
 public:
-    PongNode(rclcpp::NodeOptions options) : Node("pong_node", options)
+  explicit PongNode(rclcpp::NodeOptions options)
+  : Node("pong_node", options)
   {
     sub_ = this->create_subscription<std_msgs::msg::String>(
       "ping",

tracetools_test/src/test_publisher.cpp

@@ -1,11 +1,13 @@
+#include <memory>
+
 #include "rclcpp/rclcpp.hpp"
 #include "std_msgs/msg/string.hpp"
 
-
 class PubNode : public rclcpp::Node
 {
 public:
-    PubNode(rclcpp::NodeOptions options) : Node("pub_node", options)
+  explicit PubNode(rclcpp::NodeOptions options)
+  : Node("pub_node", options)
   {
     pub_ = this->create_publisher<std_msgs::msg::String>(
       "the_topic",

tracetools_test/src/test_service.cpp

@@ -6,11 +6,13 @@
 class ServiceNode : public rclcpp::Node
 {
 public:
-    ServiceNode(rclcpp::NodeOptions options) : Node("service_node", options)
+  explicit ServiceNode(rclcpp::NodeOptions options)
+  : Node("service_node", options)
   {
     srv_ = this->create_service<std_srvs::srv::Empty>(
       "service",
-            std::bind(&ServiceNode::service_callback,
+      std::bind(
+        &ServiceNode::service_callback,
         this,
         std::placeholders::_1,
         std::placeholders::_2,

tracetools_test/src/test_service_ping.cpp

@@ -6,15 +6,16 @@
 
 using namespace std::chrono_literals;
 
-
 class PingNode : public rclcpp::Node
 {
 public:
-    PingNode(rclcpp::NodeOptions options) : Node("ping_node", options)
+  explicit PingNode(rclcpp::NodeOptions options)
+  : Node("ping_node", options)
   {
     srv_ = this->create_service<std_srvs::srv::Empty>(
       "pong",
-            std::bind(&PingNode::service_callback,
+      std::bind(
+        &PingNode::service_callback,
         this,
         std::placeholders::_1,
         std::placeholders::_2,
@@ -26,7 +27,6 @@ public:
       std::bind(&PingNode::timer_callback, this));
   }
 
-
 private:
   void service_callback(
     const std::shared_ptr<rmw_request_id_t> request_header,

tracetools_test/src/test_service_pong.cpp

@@ -3,24 +3,23 @@
 #include "rclcpp/rclcpp.hpp"
 #include "std_srvs/srv/empty.hpp"
 
-
 class PongNode : public rclcpp::Node
 {
 public:
-    PongNode(rclcpp::NodeOptions options) : Node("pong_node", options)
+  explicit PongNode(rclcpp::NodeOptions options)
+  : Node("pong_node", options)
   {
     srv_ = this->create_service<std_srvs::srv::Empty>(
       "ping",
-            std::bind(&PongNode::service_callback,
+      std::bind(
+        &PongNode::service_callback,
         this,
         std::placeholders::_1,
         std::placeholders::_2,
         std::placeholders::_3));
-        client_ = this->create_client<std_srvs::srv::Empty>(
+    client_ = this->create_client<std_srvs::srv::Empty>("pong");
-            "pong");
   }
 
-
 private:
   void service_callback(
     const std::shared_ptr<rmw_request_id_t> request_header,

tracetools_test/src/test_subscription.cpp

@@ -3,11 +3,11 @@
 #include "rclcpp/rclcpp.hpp"
 #include "std_msgs/msg/string.hpp"
 
-
 class SubNode : public rclcpp::Node
 {
 public:
-    SubNode(rclcpp::NodeOptions options) : Node("sub_node", options)
+  explicit SubNode(rclcpp::NodeOptions options)
+  : Node("sub_node", options)
   {
     sub_ = this->create_subscription<std_msgs::msg::String>(
       "the_topic",

tracetools_test/src/test_timer.cpp

@@ -1,14 +1,15 @@
+#include <memory>
 #include <chrono>
 
 #include "rclcpp/rclcpp.hpp"
 
 using namespace std::chrono_literals;
 
-
 class TimerNode : public rclcpp::Node
 {
 public:
-    TimerNode(rclcpp::NodeOptions options) : Node("timer_node", options)
+  explicit TimerNode(rclcpp::NodeOptions options)
+  : Node("timer_node", options)
   {
     is_done_ = false;
     timer_ = this->create_wall_timer(

tracetools_test/test/test_node.py

@@ -1,8 +1,9 @@
 import unittest
+
 from tracetools_test.utils import (
+    cleanup_trace,
     get_trace_event_names,
     run_and_trace,
-    cleanup_trace,
 )
 
 BASE_PATH = '/tmp'
@@ -12,6 +13,7 @@ node_creation_events = [
     'ros2:rcl_node_init',
 ]
 
+
 class TestNode(unittest.TestCase):
 
     def test_creation(self):

tracetools_test/test/test_publisher.py

@@ -1,8 +1,9 @@
 import unittest
+
 from tracetools_test.utils import (
+    cleanup_trace,
     get_trace_event_names,
     run_and_trace,
-    cleanup_trace,
 )
 
 BASE_PATH = '/tmp'
@@ -11,6 +12,7 @@ publisher_creation_events = [
     'ros2:rcl_publisher_init',
 ]
 
+
 class TestPublisher(unittest.TestCase):
 
     def test_creation(self):

tracetools_test/test/test_service.py

@@ -1,8 +1,9 @@
 import unittest
+
 from tracetools_test.utils import (
+    cleanup_trace,
     get_trace_event_names,
     run_and_trace,
-    cleanup_trace,
 )
 
 BASE_PATH = '/tmp'
@@ -12,6 +13,7 @@ service_creation_events = [
     'ros2:rclcpp_service_callback_added',
 ]
 
+
 class TestService(unittest.TestCase):
 
     def test_creation(self):

tracetools_test/test/test_service_callback.py

@@ -1,8 +1,9 @@
 import unittest
+
 from tracetools_test.utils import (
+    cleanup_trace,
     get_trace_event_names,
     run_and_trace,
-    cleanup_trace,
 )
 
 BASE_PATH = '/tmp'
@@ -12,6 +13,7 @@ service_callback_events = [
     'ros2:rclcpp_service_callback_end',
 ]
 
+
 class TestServiceCallback(unittest.TestCase):
 
     def test_callback(self):

tracetools_test/test/test_subscription.py

@@ -1,8 +1,9 @@
 import unittest
+
 from tracetools_test.utils import (
+    cleanup_trace,
     get_trace_event_names,
     run_and_trace,
-    cleanup_trace,
 )
 
 BASE_PATH = '/tmp'
@@ -12,6 +13,7 @@ subscription_creation_events = [
     'ros2:rclcpp_subscription_callback_added',
 ]
 
+
 class TestSubscription(unittest.TestCase):
 
     def test_creation(self):

tracetools_test/test/test_subscription_callback.py

@@ -1,8 +1,9 @@
 import unittest
+
 from tracetools_test.utils import (
+    cleanup_trace,
     get_trace_event_names,
     run_and_trace,
-    cleanup_trace,
 )
 
 BASE_PATH = '/tmp'
@@ -12,6 +13,7 @@ subscription_callback_events = [
     'ros2:rclcpp_subscription_callback_end',
 ]
 
+
 class TestSubscriptionCallback(unittest.TestCase):
 
     def test_callback(self):

tracetools_test/test/test_timer.py

@@ -1,8 +1,9 @@
 import unittest
+
 from tracetools_test.utils import (
+    cleanup_trace,
     get_trace_event_names,
     run_and_trace,
-    cleanup_trace,
 )
 
 BASE_PATH = '/tmp'
@@ -14,6 +15,7 @@ timer_events = [
     'ros2:rclcpp_timer_callback_end',
 ]
 
+
 class TestTimer(unittest.TestCase):
 
     def test_all(self):

tracetools_test/tracetools_test/utils.py

@@ -1,23 +1,30 @@
 # Utils for tracetools_test
 
-import time
 import shutil
-import subprocess
+import time
+
 import babeltrace
 from launch import LaunchDescription
 from launch import LaunchService
 from launch_ros import get_default_launch_description
 import launch_ros.actions
 from tracetools_trace.tools.lttng import (
+    lttng_destroy,
     lttng_setup,
     lttng_start,
     lttng_stop,
-    lttng_destroy,
 )
 
-def run_and_trace(base_path, session_name_prefix, ros_events, kernel_events, package_name, node_names):
+
+def run_and_trace(base_path,
+                  session_name_prefix,
+                  ros_events,
+                  kernel_events,
+                  package_name,
+                  node_names):
     """
-    Run a node while tracing
+    Run a node while tracing.
+
     :param base_path (str): the base path where to put the trace directory
     :param session_name_prefix (str): the session name prefix for the trace directory
     :param ros_events (list(str)): the list of ROS UST events to enable
@@ -53,7 +60,8 @@ def run_and_trace(base_path, session_name_prefix, ros_events, kernel_events, pac
 
 def cleanup_trace(full_path):
     """
-    Cleanup trace data
+    Cleanup trace data.
+
     :param full_path (str): the full path to the main trace directory
     """
     shutil.rmtree(full_path)
@@ -61,7 +69,8 @@ def cleanup_trace(full_path):
 
 def get_trace_event_names(trace_directory):
     """
-    Get a set of event names in a trace
+    Get a set of event names in a trace.
+
     :param trace_directory (str): the path to the main/top trace directory
     :return: event names (set(str))
     """