diff options
| author | Michael Puskas <mmpuskas@gmail.com> | 2022-05-01 23:51:22 +0300 |
|---|---|---|
| committer | Michael Puskas <mmpuskas@gmail.com> | 2022-05-01 23:52:27 +0300 |
| commit | a5ea07f107bbc4ca3440bd23614c247617e9ee4f (patch) | |
| tree | f48df7e9ce5711b417b60b521df0004e5676fda0 | |
| parent | aa2bbfe5f9dea5b919984e7051a361b3e4efdadb (diff) | |
Fix build options, add TRACY_TIMER_FALLBACK option.
Renamed TRACY_NO_SYS_TRACE -> TRACY_NO_SYSTEM_TRACING to match the
build flag name. Unlike the meson logic, the CMake logic directly
maps the option name to the build flag that is injected. With the
mismatched name, the flag wasn't being properly applied.
Added TRACY_TIMER_FALLBACK option to expose the same-named flag.
Moved signal.h include to get sigaction definition that was missing when
TRACY_NO_CALLSTACK was defined.
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | client/TracyProfiler.cpp | 1 | ||||
| -rw-r--r-- | client/TracyProfiler.hpp | 4 | ||||
| -rw-r--r-- | meson.build | 6 |
4 files changed, 11 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b590358..15991852 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,11 +49,12 @@ set_option(TRACY_NO_SAMPLING "Disable call stack sampling" OFF) set_option(TRACY_NO_VERIFY "Disable zone validation for C API" OFF) set_option(TRACY_NO_VSYNC_CAPTURE "Disable capture of hardware Vsync events" OFF) set_option(TRACY_NO_FRAME_IMAGE "Disable the frame image support and its thread" OFF) -set_option(TRACY_NO_SYS_TRACE "Disable systrace sampling" OFF) +set_option(TRACY_NO_SYSTEM_TRACING "Disable systrace sampling" OFF) set_option(TRACY_DELAYED_INIT "Enable delayed initialization of the library (init on first call)" OFF) set_option(TRACY_MANUAL_LIFETIME "Enable the manual lifetime management of the profile" OFF) set_option(TRACY_FIBERS "Enable fibers support" OFF) set_option(TRACY_NO_CRASH_HANDLER, "Disable crash handling" OFF) +set_option(TRACY_TIMER_FALLBACK "Use lower resolution timers" OFF) if(BUILD_SHARED_LIBS) target_compile_definitions(TracyClient PRIVATE TRACY_EXPORTS) diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp index 7648d410..d986b947 100644 --- a/client/TracyProfiler.cpp +++ b/client/TracyProfiler.cpp @@ -21,7 +21,6 @@ #ifdef __linux__ # include <dirent.h> -# include <signal.h> # include <pthread.h> # include <sys/types.h> # include <sys/syscall.h> diff --git a/client/TracyProfiler.hpp b/client/TracyProfiler.hpp index 595b81bf..7dce3c61 100644 --- a/client/TracyProfiler.hpp +++ b/client/TracyProfiler.hpp @@ -30,6 +30,10 @@ # define TRACY_HW_TIMER #endif +#ifdef __linux__ +# include <signal.h> +#endif + #if defined TRACY_TIMER_FALLBACK || !defined TRACY_HW_TIMER # include <chrono> #endif diff --git a/meson.build b/meson.build index 9c343001..54a81c0f 100644 --- a/meson.build +++ b/meson.build @@ -60,7 +60,7 @@ if get_option('tracy_no_frame_image') add_project_arguments('-DTRACY_NO_FRAME_IMAGE', language : 'cpp') endif -if get_option('tracy_no_sys_trace') +if get_option('tracy_no_system_tracing') add_project_arguments('-DTRACY_NO_SYSTEM_TRACING', language : 'cpp') endif @@ -76,6 +76,10 @@ if get_option('tracy_fibers') add_project_arguments('-DTRACY_FIBERS', language : 'cpp') endif +if get_option('tracy_timer_fallback') + add_project_arguments('-DTRACY_TIMER_FALLBACK', language : 'cpp') +endif + tracy_shared_libs = get_option('tracy_shared_libs') if tracy_shared_libs add_project_arguments('-DTRACY_EXPORTS', language : 'cpp') |