Merge branch '103-revert-breaking-changes' into 'foxy'

Revert recent breaking changes

See merge request micro-ROS/ros_tracing/ros2_tracing!201

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
@@ -95,9 +93,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
   "$<INSTALL_INTERFACE:include>"
 )
-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 +129,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()
 

tracetools/include/tracetools/utils.hpp

@@ -18,14 +18,11 @@
 #include <stddef.h>
 #include <functional>
 
-#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_

tracetools/src/utils.cpp

@@ -14,8 +14,6 @@
 
 #include "tracetools/config.h"
 
-#ifndef TRACETOOLS_DISABLED
-
 #ifdef TRACETOOLS_LTTNG_ENABLED
 #include <dlfcn.h>
 #include <cxxabi.h>
@@ -50,5 +48,3 @@ const char * _get_symbol_funcptr(void * funcptr)
   return "DISABLED__get_symbol_funcptr";
 #endif
 }
-
-#endif  // TRACETOOLS_DISABLED