From eb8c581241b2be376ae503b1f7a50fea554473b5 Mon Sep 17 00:00:00 2001 From: Ptolemy Date: Tue, 5 Oct 2021 16:03:23 -0700 Subject: [PATCH] SL-16028: Cleanup Thread macros for when Tracy is off --- indra/llcommon/llprofiler.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/llcommon/llprofiler.h b/indra/llcommon/llprofiler.h index 6fa8640672..195fd22f91 100644 --- a/indra/llcommon/llprofiler.h +++ b/indra/llcommon/llprofiler.h @@ -70,9 +70,9 @@ #endif #if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_FAST_TIMER #define LL_PROFILER_FRAME_END - #define LL_PROFILER_SET_THREAD_NAME( name ) (void)(name) - #define LL_PROFILER_THREAD_BEGIN // Not supported - #define LL_PROFILER_THREAD_END // Not supported + #define LL_PROFILER_SET_THREAD_NAME( name ) (void)(name); + #define LL_PROFILER_THREAD_BEGIN(name) (void)(name); // Not supported + #define LL_PROFILER_THREAD_END(name) (void)(name); // Not supported #define LL_RECORD_BLOCK_TIME(name) const LLTrace::BlockTimer& LL_GLUE_TOKENS(block_time_recorder, __LINE__)(LLTrace::timeThisBlock(name)); (void)LL_GLUE_TOKENS(block_time_recorder, __LINE__); #define LL_PROFILE_ZONE_NAMED(name) // LL_PROFILE_ZONE_NAMED is a no-op when Tracy is disabled @@ -89,8 +89,8 @@ #if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER #define LL_PROFILER_FRAME_END FrameMark #define LL_PROFILER_SET_THREAD_NAME( name ) tracy::SetThreadName( name ) - #define LL_PROFILER_THREAD_BEGIN FrameMarkStart(mName.c_str()) - #define LL_PROFILER_THREAD_END FrameMarkEnd(mName.c_str()) + #define LL_PROFILER_THREAD_BEGIN(name) FrameMarkStart( name ) // C string + #define LL_PROFILER_THREAD_END(name) FrameMarkEnd( name ) // C string #define LL_RECORD_BLOCK_TIME(name) ZoneScoped const LLTrace::BlockTimer& LL_GLUE_TOKENS(block_time_recorder, __LINE__)(LLTrace::timeThisBlock(name)); (void)LL_GLUE_TOKENS(block_time_recorder, __LINE__); #define LL_PROFILE_ZONE_NAMED(name) ZoneNamedN( ___tracy_scoped_zone, #name, true );