GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix memory profiler thread-local storage to avoid dynamic mem alloc due to recursive call

Browse Source
This commit is contained in:
Wojtek Figat
2025-06-06 14:52:27 +02:00
parent cd637e8a7a
commit e8b60060ab
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Engine/Profiler/ProfilerMemory.cpp
View File

@@ -106,7 +106,13 @@ namespace
alignas(16) volatile uint32 GroupTracyPlotEnable[(GROUPS_COUNT + 31) / 32] = {}; alignas(16) volatile uint32 GroupTracyPlotEnable[(GROUPS_COUNT + 31) / 32] = {};
#endif #endif
uint8 GroupParents[GROUPS_COUNT] = {}; uint8 GroupParents[GROUPS_COUNT] = {};
#if 0
ThreadLocal<GroupStackData> GroupStack; ThreadLocal<GroupStackData> GroupStack;
#define GetGroupStack() GroupStack.Get();
#else
THREADLOCAL GroupStackData GroupStack;
#define GetGroupStack() GroupStack
#endif
GroupNameBuffer GroupNames[GROUPS_COUNT]; GroupNameBuffer GroupNames[GROUPS_COUNT];
CriticalSection PointersLocker; CriticalSection PointersLocker;
Dictionary<void*, PointerData> Pointers; Dictionary<void*, PointerData> Pointers;
@@ -347,13 +353,13 @@ void ProfilerMemory::DecrementGroup(Groups group, uint64 size)
void ProfilerMemory::BeginGroup(Groups group) void ProfilerMemory::BeginGroup(Groups group)
{ {
auto& stack = GroupStack.Get(); auto& stack = GetGroupStack();
stack.Push(group); stack.Push(group);
} }
void ProfilerMemory::EndGroup() void ProfilerMemory::EndGroup()
{ {
auto& stack = GroupStack.Get(); auto& stack = GetGroupStack();
stack.Pop(); stack.Pop();
} }
@@ -417,7 +423,7 @@ void ProfilerMemory::Dump(const StringView& options)
void ProfilerMemory::OnMemoryAlloc(void* ptr, uint64 size) void ProfilerMemory::OnMemoryAlloc(void* ptr, uint64 size)
{ {
ASSERT_LOW_LAYER(Enabled && ptr); ASSERT_LOW_LAYER(Enabled && ptr);
auto& stack = GroupStack.Get(); auto& stack = GetGroupStack();
if (stack.SkipRecursion) if (stack.SkipRecursion)
return; return;
stack.SkipRecursion = true; stack.SkipRecursion = true;
@@ -443,7 +449,7 @@ void ProfilerMemory::OnMemoryAlloc(void* ptr, uint64 size)
void ProfilerMemory::OnMemoryFree(void* ptr) void ProfilerMemory::OnMemoryFree(void* ptr)
{ {
ASSERT_LOW_LAYER(Enabled && ptr); ASSERT_LOW_LAYER(Enabled && ptr);
auto& stack = GroupStack.Get(); auto& stack = GetGroupStack();
if (stack.SkipRecursion) if (stack.SkipRecursion)
return; return;
stack.SkipRecursion = true; stack.SkipRecursion = true;