From 32806e8f4e46aa3d43203ad5aa113ae9e104f3d8 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Thu, 13 May 2021 12:04:10 +0200 Subject: [PATCH] Remove unused `transient` param from profile events --- Source/Engine/Profiler/ProfilerCPU.cpp | 8 ++++---- Source/Engine/Profiler/ProfilerCPU.h | 18 ++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Source/Engine/Profiler/ProfilerCPU.cpp b/Source/Engine/Profiler/ProfilerCPU.cpp index 574028af1..2119a25d7 100644 --- a/Source/Engine/Profiler/ProfilerCPU.cpp +++ b/Source/Engine/Profiler/ProfilerCPU.cpp @@ -154,7 +154,7 @@ int32 ProfilerCPU::BeginEvent() return thread->BeginEvent(); } -int32 ProfilerCPU::BeginEvent(const Char* name, bool transient) +int32 ProfilerCPU::BeginEvent(const Char* name) { if (!Enabled) return -1; @@ -165,7 +165,7 @@ int32 ProfilerCPU::BeginEvent(const Char* name, bool transient) auto src = name; if (src) { - auto end = dst + ARRAY_COUNT(e.Name) - 1; + const auto end = dst + ARRAY_COUNT(e.Name) - 1; while (*src && dst != end) *dst++ = *src++; } @@ -173,7 +173,7 @@ int32 ProfilerCPU::BeginEvent(const Char* name, bool transient) return index; } -int32 ProfilerCPU::BeginEvent(const char* name, bool transient) +int32 ProfilerCPU::BeginEvent(const char* name) { if (!Enabled) return -1; @@ -184,7 +184,7 @@ int32 ProfilerCPU::BeginEvent(const char* name, bool transient) auto src = name; if (src) { - auto end = dst + ARRAY_COUNT(e.Name) - 1; + const auto end = dst + ARRAY_COUNT(e.Name) - 1; while (*src && dst != end) *dst++ = *src++; } diff --git a/Source/Engine/Profiler/ProfilerCPU.h b/Source/Engine/Profiler/ProfilerCPU.h index 129219b66..c76c33e27 100644 --- a/Source/Engine/Profiler/ProfilerCPU.h +++ b/Source/Engine/Profiler/ProfilerCPU.h @@ -325,17 +325,15 @@ public: /// Begins the event. Call EndEvent with index parameter equal to the returned value by BeginEvent function. /// /// The event name. - /// True if name is transient and should be cached by allocator (not static). /// The event token. - static int32 BeginEvent(const Char* name, bool transient = false); + static int32 BeginEvent(const Char* name); /// /// Begins the event. Call EndEvent with index parameter equal to the returned value by BeginEvent function. /// /// The event name. - /// True if name is transient and should be cached by allocator (not static). /// The event token. - static int32 BeginEvent(const char* name, bool transient = false); + static int32 BeginEvent(const char* name); /// /// Ends the event. @@ -356,14 +354,14 @@ struct ScopeProfileBlockCPU { int32 Index; - FORCE_INLINE ScopeProfileBlockCPU(const Char* name, bool transient = false) + FORCE_INLINE ScopeProfileBlockCPU(const Char* name) { - Index = ProfilerCPU::BeginEvent(name, transient); + Index = ProfilerCPU::BeginEvent(name); } - FORCE_INLINE ScopeProfileBlockCPU(const char* name, bool transient = false) + FORCE_INLINE ScopeProfileBlockCPU(const char* name) { - Index = ProfilerCPU::BeginEvent(name, transient); + Index = ProfilerCPU::BeginEvent(name); } FORCE_INLINE ~ScopeProfileBlockCPU() @@ -381,12 +379,12 @@ struct TIsPODType // Shortcut macros for profiling a single code block execution on CPU // Use ZoneTransient for Tracy for code that can be hot-reloaded (eg. in Editor) or if name can be a variable -#define PROFILE_CPU_NAMED(name) ZoneTransientN(___tracy_scoped_zone, name, true); ScopeProfileBlockCPU ProfileBlockCPU(name, true) +#define PROFILE_CPU_NAMED(name) ZoneTransientN(___tracy_scoped_zone, name, true); ScopeProfileBlockCPU ProfileBlockCPU(name) #if defined(_MSC_VER) #if USE_EDITOR -#define PROFILE_CPU() ZoneTransient(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(TEXT(__FUNCTION__), false) +#define PROFILE_CPU() ZoneTransient(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(TEXT(__FUNCTION__)) #else #define PROFILE_CPU() ZoneNamed(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(TEXT(__FUNCTION__))