From e7b9bffbbd1dfa036bf85c499755779b5801ad04 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Thu, 21 Dec 2023 14:07:44 +0100 Subject: [PATCH] Rename TRACE_CLIENT_LIBUNWIND_BACKTRACE to TRACY_LIBUNWIND_BACKTRACE. --- CMakeLists.txt | 2 +- meson.build | 2 +- public/client/TracyCallstack.hpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 578351fe..4c700702 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,7 +84,7 @@ set_option(TRACY_MANUAL_LIFETIME "Enable the manual lifetime management of the p 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) -set_option(TRACE_CLIENT_LIBUNWIND_BACKTRACE "Use libunwind backtracing where supported" OFF) +set_option(TRACY_LIBUNWIND_BACKTRACE "Use libunwind backtracing where supported" OFF) set_option(TRACY_SYMBOL_OFFLINE_RESOLVE "Instead of full runtime symbol resolution, only resolve the image path and offset to enable offline symbol resolution" OFF) set_option(TRACY_LIBBACKTRACE_ELF_DYNLOAD_SUPPORT "Enable libbacktrace to support dynamically loaded elfs in symbol resolution resolution after the first symbol resolve operation" OFF) diff --git a/meson.build b/meson.build index bb0e8458..9921db4f 100644 --- a/meson.build +++ b/meson.build @@ -98,7 +98,7 @@ if get_option('tracy_no_crash_handler') endif if get_option('tracy_libunwind_backtrace') - tracy_common_args += ['-DTRACE_CLIENT_LIBUNWIND_BACKTRACE'] + tracy_common_args += ['-DTRACY_LIBUNWIND_BACKTRACE'] tracy_public_deps += dependency('libunwind') endif diff --git a/public/client/TracyCallstack.hpp b/public/client/TracyCallstack.hpp index 63e081f9..e1de3821 100644 --- a/public/client/TracyCallstack.hpp +++ b/public/client/TracyCallstack.hpp @@ -8,7 +8,7 @@ #if TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 5 # include #elif TRACY_HAS_CALLSTACK >= 3 -# ifdef TRACE_CLIENT_LIBUNWIND_BACKTRACE +# ifdef TRACY_LIBUNWIND_BACKTRACE // libunwind is, in general, significantly faster than execinfo based backtraces # define UNW_LOCAL_ONLY # include @@ -133,7 +133,7 @@ static tracy_force_inline void* Callstack( int depth ) auto trace = (uintptr_t*)tracy_malloc( ( 1 + (size_t)depth ) * sizeof( uintptr_t ) ); -#ifdef TRACE_CLIENT_LIBUNWIND_BACKTRACE +#ifdef TRACY_LIBUNWIND_BACKTRACE size_t num = unw_backtrace( (void**)(trace+1), depth ); #else const auto num = (size_t)backtrace( (void**)(trace+1), depth );