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

Merge branch 'feature/foxy_migration' into 'foxy'

Browse source 
Release micro-ROS Foxy: disable tracetools status app

See merge request micro-ROS/ros_tracing/ros2_tracing!192
This commit is contained in:
Ingo Lütkebohle 2020-07-22 11:06:10 +00:00
commit ade91660a1
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tracetools/CMakeLists.txt
View file

@ -21,6 +21,7 @@ else()
endif() endif()
option(TRACETOOLS_DISABLED "Explicitly disable support for tracing" ${DISABLED_DEFAULT}) option(TRACETOOLS_DISABLED "Explicitly disable support for tracing" ${DISABLED_DEFAULT})
option(TRACETOOLS_NO_RDYNAMIC "Disable export of -rdynamic link flag" OFF) option(TRACETOOLS_NO_RDYNAMIC "Disable export of -rdynamic link flag" OFF)
option(TRACETOOLS_STATUS_CHECKING_TOOL "Enable the status checking tool" ON)
if(NOT TRACETOOLS_DISABLED) if(NOT TRACETOOLS_DISABLED)
# Set TRACETOOLS_LTTNG_ENABLED if we can find lttng-ust # Set TRACETOOLS_LTTNG_ENABLED if we can find lttng-ust
@ -94,17 +95,19 @@ target_include_directories(${PROJECT_NAME} PUBLIC
) )
ament_export_targets(${PROJECT_NAME}_export HAS_LIBRARY_TARGET) ament_export_targets(${PROJECT_NAME}_export HAS_LIBRARY_TARGET)
# Status checking tool if(TRACETOOLS_STATUS_CHECKING_TOOL)
add_executable(status # Status checking tool
add_executable(status
src/status.c src/status.c
) )
target_link_libraries(status target_link_libraries(status
${PROJECT_NAME} ${PROJECT_NAME}
) )
install(TARGETS install(TARGETS
status status
DESTINATION lib/${PROJECT_NAME} DESTINATION lib/${PROJECT_NAME}
) )
endif()
install( install(
DIRECTORY ${PROJECT_BINARY_DIR}/include/ DIRECTORY ${PROJECT_BINARY_DIR}/include/

5
tracetools/include/tracetools/utils.hpp
View file

@ -18,11 +18,14 @@
#include <stddef.h> #include <stddef.h>
#include <functional> #include <functional>
#include "tracetools/config.h"
#include "tracetools/visibility_control.hpp" #include "tracetools/visibility_control.hpp"
/// Default symbol, used when address resolution fails. /// Default symbol, used when address resolution fails.
#define SYMBOL_UNKNOWN "UNKNOWN" #define SYMBOL_UNKNOWN "UNKNOWN"
#ifndef TRACETOOLS_DISABLED
TRACETOOLS_PUBLIC const char * _demangle_symbol(const char * mangled); TRACETOOLS_PUBLIC const char * _demangle_symbol(const char * mangled);
TRACETOOLS_PUBLIC const char * _get_symbol_funcptr(void * funcptr); TRACETOOLS_PUBLIC const char * _get_symbol_funcptr(void * funcptr);
@ -62,4 +65,6 @@ const char * get_symbol(L && l)
return _demangle_symbol(typeid(l).name()); return _demangle_symbol(typeid(l).name());
} }
#endif // TRACETOOLS_DISABLED
#endif // TRACETOOLS__UTILS_HPP_ #endif // TRACETOOLS__UTILS_HPP_