From 7dc0a834e28e00707b33e71bb7e416c5da3ed4d3 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Thu, 10 Sep 2020 19:31:55 -0400 Subject: [PATCH 1/4] Revert "Do not export tracetools if empty" This reverts commit 514f57e690522b80640b706d295b680c8214b06c. Signed-off-by: Christophe Bedard --- tracetools/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tracetools/CMakeLists.txt b/tracetools/CMakeLists.txt index fd518ed..0610075 100644 --- a/tracetools/CMakeLists.txt +++ b/tracetools/CMakeLists.txt @@ -95,9 +95,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC "$" "$" ) -if(NOT TRACETOOLS_DISABLED) - ament_export_targets(${PROJECT_NAME}_export HAS_LIBRARY_TARGET) -endif() +ament_export_targets(${PROJECT_NAME}_export HAS_LIBRARY_TARGET) if(TRACETOOLS_STATUS_CHECKING_TOOL) # Status checking tool @@ -133,7 +131,7 @@ if(TRACETOOLS_LTTNG_ENABLED) if(NOT TRACETOOLS_NO_RDYNAMIC) ament_export_link_flags("-rdynamic") endif() -elseif(NOT TRACETOOLS_DISABLED) +else() ament_export_libraries(${PROJECT_NAME}) endif() From d21abd6d749a1fd526cddf331342e504a99b5ee9 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Thu, 10 Sep 2020 19:32:05 -0400 Subject: [PATCH 2/4] Revert "Disable status checking tool by default on Windows" This reverts commit c3c16707eb85ba1419694c3e6313f0c41a36e91f. Signed-off-by: Christophe Bedard --- tracetools/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tracetools/CMakeLists.txt b/tracetools/CMakeLists.txt index 0610075..df522cf 100644 --- a/tracetools/CMakeLists.txt +++ b/tracetools/CMakeLists.txt @@ -16,14 +16,12 @@ find_package(ament_cmake_ros REQUIRED) if(WIN32) set(DISABLED_DEFAULT ON) - set(STATUS_CHECKING_TOOL_DEFAULT OFF) else() set(DISABLED_DEFAULT OFF) - set(STATUS_CHECKING_TOOL_DEFAULT ON) endif() option(TRACETOOLS_DISABLED "Explicitly disable support for tracing" ${DISABLED_DEFAULT}) option(TRACETOOLS_NO_RDYNAMIC "Disable export of -rdynamic link flag" OFF) -option(TRACETOOLS_STATUS_CHECKING_TOOL "Enable the status checking tool" ${STATUS_CHECKING_TOOL_DEFAULT}) +option(TRACETOOLS_STATUS_CHECKING_TOOL "Enable the status checking tool" ON) if(NOT TRACETOOLS_DISABLED) # Set TRACETOOLS_LTTNG_ENABLED if we can find lttng-ust From c9c5a9b79ed4cb4c05b6f2f10c7aae9a9ab01eac Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Thu, 10 Sep 2020 19:32:15 -0400 Subject: [PATCH 3/4] Revert "Ifdef util function implementations if tracing is disabled" This reverts commit 555ed59077eac99312e706f9b39e681c51200ba3. Signed-off-by: Christophe Bedard --- tracetools/src/utils.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tracetools/src/utils.cpp b/tracetools/src/utils.cpp index 8b5389e..8622476 100644 --- a/tracetools/src/utils.cpp +++ b/tracetools/src/utils.cpp @@ -14,8 +14,6 @@ #include "tracetools/config.h" -#ifndef TRACETOOLS_DISABLED - #ifdef TRACETOOLS_LTTNG_ENABLED #include #include @@ -50,5 +48,3 @@ const char * _get_symbol_funcptr(void * funcptr) return "DISABLED__get_symbol_funcptr"; #endif } - -#endif // TRACETOOLS_DISABLED From 4f131147af75686e6ed9f87df0dcd5992de0d7a8 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Thu, 10 Sep 2020 19:34:33 -0400 Subject: [PATCH 4/4] Partially revert "Release micro-ROS Foxy: disable tracetools status app" This partially reverts commit b473cec508adffe492f45e99ab1b6620312dcae2. Signed-off-by: Christophe Bedard --- tracetools/include/tracetools/utils.hpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tracetools/include/tracetools/utils.hpp b/tracetools/include/tracetools/utils.hpp index db947e6..e3c934d 100644 --- a/tracetools/include/tracetools/utils.hpp +++ b/tracetools/include/tracetools/utils.hpp @@ -18,14 +18,11 @@ #include #include -#include "tracetools/config.h" #include "tracetools/visibility_control.hpp" /// Default symbol, used when address resolution fails. #define SYMBOL_UNKNOWN "UNKNOWN" -#ifndef TRACETOOLS_DISABLED - TRACETOOLS_PUBLIC const char * _demangle_symbol(const char * mangled); TRACETOOLS_PUBLIC const char * _get_symbol_funcptr(void * funcptr); @@ -65,6 +62,4 @@ const char * get_symbol(L && l) return _demangle_symbol(typeid(l).name()); } -#endif // TRACETOOLS_DISABLED - #endif // TRACETOOLS__UTILS_HPP_