niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ifdefs to remove tracing-related calls if tracing is disabled (#1001)

Browse source 
* Add ifdefs to remove tracing-related calls if tracing is disabled

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>

* Move ifndefs inside register_callback_for_tracing

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
This commit is contained in:
Dirk Thomas 2020-03-05 11:03:19 -08:00 • committed by GitHub
parent 68cb936bca
commit 87fa896e38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rclcpp/include/rclcpp/any_service_callback.hpp
View file

@ -102,6 +102,7 @@ public:
void register_callback_for_tracing() void register_callback_for_tracing()
{ {
#ifndef TRACETOOLS_DISABLED
if (shared_ptr_callback_) { if (shared_ptr_callback_) {
TRACEPOINT( TRACEPOINT(
rclcpp_callback_register, rclcpp_callback_register,
@ -113,6 +114,7 @@ public:
(const void *)this, (const void *)this,
get_symbol(shared_ptr_with_request_header_callback_)); get_symbol(shared_ptr_with_request_header_callback_));
} }
#endif // TRACETOOLS_DISABLED
} }
}; };

2
rclcpp/include/rclcpp/any_subscription_callback.hpp
View file

@ -234,6 +234,7 @@ public:
void register_callback_for_tracing() void register_callback_for_tracing()
{ {
#ifndef TRACETOOLS_DISABLED
if (shared_ptr_callback_) { if (shared_ptr_callback_) {
TRACEPOINT( TRACEPOINT(
rclcpp_callback_register, rclcpp_callback_register,
@ -255,6 +256,7 @@ public:
(const void *)this, (const void *)this,
get_symbol(unique_ptr_with_info_callback_)); get_symbol(unique_ptr_with_info_callback_));
} }
#endif // TRACETOOLS_DISABLED
} }
private: private:

2
rclcpp/include/rclcpp/experimental/subscription_intra_process.hpp
View file

@ -97,7 +97,9 @@ public:
// The callback object gets copied, so if registration is done too early/before this point // 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 // (e.g. in `AnySubscriptionCallback::set()`), its address won't match any address used later
// in subsequent tracepoints. // in subsequent tracepoints.
#ifndef TRACETOOLS_DISABLED
any_callback_.register_callback_for_tracing(); any_callback_.register_callback_for_tracing();
#endif
} }
bool bool

6
rclcpp/include/rclcpp/service.hpp
View file

@ -159,7 +159,9 @@ public:
rclcpp_service_callback_added, rclcpp_service_callback_added,
(const void *)get_service_handle().get(), (const void *)get_service_handle().get(),
(const void *)&any_callback_); (const void *)&any_callback_);
#ifndef TRACETOOLS_DISABLED
any_callback_.register_callback_for_tracing(); any_callback_.register_callback_for_tracing();
#endif
} }
Service( Service(
@ -182,7 +184,9 @@ public:
rclcpp_service_callback_added, rclcpp_service_callback_added,
(const void *)get_service_handle().get(), (const void *)get_service_handle().get(),
(const void *)&any_callback_); (const void *)&any_callback_);
#ifndef TRACETOOLS_DISABLED
any_callback_.register_callback_for_tracing(); any_callback_.register_callback_for_tracing();
#endif
} }
Service( Service(
@ -207,7 +211,9 @@ public:
rclcpp_service_callback_added, rclcpp_service_callback_added,
(const void *)get_service_handle().get(), (const void *)get_service_handle().get(),
(const void *)&any_callback_); (const void *)&any_callback_);
#ifndef TRACETOOLS_DISABLED
any_callback_.register_callback_for_tracing(); any_callback_.register_callback_for_tracing();
#endif
} }
Service() = delete; Service() = delete;

2
rclcpp/include/rclcpp/subscription.hpp
View file

@ -176,7 +176,9 @@ public:
// The callback object gets copied, so if registration is done too early/before this point // 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 // (e.g. in `AnySubscriptionCallback::set()`), its address won't match any address used later
// in subsequent tracepoints. // in subsequent tracepoints.
#ifndef TRACETOOLS_DISABLED
any_callback_.register_callback_for_tracing(); any_callback_.register_callback_for_tracing();
#endif
} }
/// Called after construction to continue setup that requires shared_from_this(). /// Called after construction to continue setup that requires shared_from_this().