From c7a22cc1ffd56ca0def2196ac658b6d8cfdb00ae Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Thu, 21 Nov 2019 19:50:46 +0100 Subject: [PATCH] Use libbacktrace on BSD. --- TracyClient.cpp | 2 +- client/TracyCallstack.cpp | 4 ++-- client/TracyCallstack.h | 4 +++- client/TracyCallstack.hpp | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/TracyClient.cpp b/TracyClient.cpp index c5eab179..76ee8536 100644 --- a/TracyClient.cpp +++ b/TracyClient.cpp @@ -24,7 +24,7 @@ #include "client/tracy_rpmalloc.cpp" #include "client/TracyDxt1.cpp" -#if TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 +#if TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 || TRACY_HAS_CALLSTACK == 6 # include "libbacktrace/alloc.cpp" # include "libbacktrace/dwarf.cpp" # include "libbacktrace/elf.cpp" diff --git a/client/TracyCallstack.cpp b/client/TracyCallstack.cpp index 976f434b..47473e73 100644 --- a/client/TracyCallstack.cpp +++ b/client/TracyCallstack.cpp @@ -17,7 +17,7 @@ # ifdef _MSC_VER # pragma warning( pop ) # endif -#elif TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 +#elif TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 || TRACY_HAS_CALLSTACK == 6 # include "../libbacktrace/backtrace.hpp" # include # include @@ -312,7 +312,7 @@ CallstackEntryData DecodeCallstackPtr( uint64_t ptr ) return { &cb, 1 }; } -#elif TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 +#elif TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 || TRACY_HAS_CALLSTACK == 6 enum { MaxCbTrace = 16 }; diff --git a/client/TracyCallstack.h b/client/TracyCallstack.h index e8d4eea7..87d8ce72 100644 --- a/client/TracyCallstack.h +++ b/client/TracyCallstack.h @@ -19,8 +19,10 @@ # else # define TRACY_HAS_CALLSTACK 2 # endif -#elif defined __APPLE__ || defined BSD +#elif defined __APPLE__ # define TRACY_HAS_CALLSTACK 4 +#elif defined BSD +# define TRACY_HAS_CALLSTACK 6 #endif #endif diff --git a/client/TracyCallstack.hpp b/client/TracyCallstack.hpp index 6a853925..17e514ac 100644 --- a/client/TracyCallstack.hpp +++ b/client/TracyCallstack.hpp @@ -90,7 +90,7 @@ static tracy_force_inline void* Callstack( int depth ) return trace; } -#elif TRACY_HAS_CALLSTACK == 3 || TRACY_HAS_CALLSTACK == 4 +#elif TRACY_HAS_CALLSTACK == 3 || TRACY_HAS_CALLSTACK == 4 || TRACY_HAS_CALLSTACK == 6 static tracy_force_inline void* Callstack( int depth ) {