Add ifdefs to remove tracing-related calls if tracing is disabled

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
ros2 · Feb 25, 2020 · 8b17de4 · 8b17de4
1 parent 72083a1
commit 8b17de4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/rclcpp/include/rclcpp/any_service_callback.hpp b/rclcpp/include/rclcpp/any_service_callback.hpp
@@ -100,6 +100,7 @@ class AnyServiceCallback
     TRACEPOINT(callback_end, (const void *)this);
   }
 
+#ifndef TRACETOOLS_DISABLED
   void register_callback_for_tracing()
   {
     if (shared_ptr_callback_) {
@@ -114,6 +115,7 @@ class AnyServiceCallback
         get_symbol(shared_ptr_with_request_header_callback_));
     }
   }
+#endif  // TRACETOOLS_DISABLED
 };
 
 }  // namespace rclcpp

diff --git a/rclcpp/include/rclcpp/any_subscription_callback.hpp b/rclcpp/include/rclcpp/any_subscription_callback.hpp
@@ -232,6 +232,7 @@ class AnySubscriptionCallback
     return const_shared_ptr_callback_ || const_shared_ptr_with_info_callback_;
   }
 
+#ifndef TRACETOOLS_DISABLED
   void register_callback_for_tracing()
   {
     if (shared_ptr_callback_) {
@@ -256,6 +257,7 @@ class AnySubscriptionCallback
         get_symbol(unique_ptr_with_info_callback_));
     }
   }
+#endif  // TRACETOOLS_DISABLED
 
 private:
   std::shared_ptr<MessageAlloc> message_allocator_;

diff --git a/rclcpp/include/rclcpp/experimental/subscription_intra_process.hpp b/rclcpp/include/rclcpp/experimental/subscription_intra_process.hpp
@@ -97,7 +97,9 @@ class SubscriptionIntraProcess : public SubscriptionIntraProcessBase
     // The callback object gets copied, so if registration is done too early/before this point
     // (e.g. in `AnySubscriptionCallback::set()`), its address won't match any address used later
     // in subsequent tracepoints.
+#ifndef TRACETOOLS_DISABLED
     any_callback_.register_callback_for_tracing();
+#endif
   }
 
   bool

diff --git a/rclcpp/include/rclcpp/service.hpp b/rclcpp/include/rclcpp/service.hpp
@@ -159,7 +159,9 @@ class Service : public ServiceBase
       rclcpp_service_callback_added,
       (const void *)get_service_handle().get(),
       (const void *)&any_callback_);
+#ifndef TRACETOOLS_DISABLED
     any_callback_.register_callback_for_tracing();
+#endif
   }
 
   Service(
@@ -182,7 +184,9 @@ class Service : public ServiceBase
       rclcpp_service_callback_added,
       (const void *)get_service_handle().get(),
       (const void *)&any_callback_);
+#ifndef TRACETOOLS_DISABLED
     any_callback_.register_callback_for_tracing();
+#endif
   }
 
   Service(
@@ -207,7 +211,9 @@ class Service : public ServiceBase
       rclcpp_service_callback_added,
       (const void *)get_service_handle().get(),
       (const void *)&any_callback_);
+#ifndef TRACETOOLS_DISABLED
     any_callback_.register_callback_for_tracing();
+#endif
   }
 
   Service() = delete;

diff --git a/rclcpp/include/rclcpp/subscription.hpp b/rclcpp/include/rclcpp/subscription.hpp
@@ -176,7 +176,9 @@ class Subscription : public SubscriptionBase
     // The callback object gets copied, so if registration is done too early/before this point
     // (e.g. in `AnySubscriptionCallback::set()`), its address won't match any address used later
     // in subsequent tracepoints.
+#ifndef TRACETOOLS_DISABLED
     any_callback_.register_callback_for_tracing();
+#endif
   }
 
   /// Called after construction to continue setup that requires shared_from_this().