From afe2fad1a7107e29fe64f9fd4468aa95632c1589 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Tue, 5 Mar 2019 19:18:43 +0100 Subject: [PATCH] Send native callstack before allocated one. --- client/TracyProfiler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp index 052d5a98..519903ca 100644 --- a/client/TracyProfiler.cpp +++ b/client/TracyProfiler.cpp @@ -1329,10 +1329,10 @@ static void FreeAssociatedMemory( const QueueItem& item ) tracy_free( (void*)ptr ); break; case QueueType::CallstackAlloc: - ptr = MemRead( &item.callstackAlloc.ptr ); - tracy_free( (void*)ptr ); ptr = MemRead( &item.callstackAlloc.nativePtr ); tracy_free( (void*)ptr ); + ptr = MemRead( &item.callstackAlloc.ptr ); + tracy_free( (void*)ptr ); break; default: assert( false ); @@ -1409,13 +1409,13 @@ Profiler::DequeueStatus Profiler::Dequeue( moodycamel::ConsumerToken& token ) tracy_free( (void*)ptr ); break; case QueueType::CallstackAlloc: - ptr = MemRead( &item->callstackAlloc.ptr ); - SendCallstackAlloc( ptr ); - tracy_free( (void*)ptr ); ptr = MemRead( &item->callstackAlloc.nativePtr ); CutCallstack( (void*)ptr, "lua_pcall" ); SendCallstackPayload( ptr ); tracy_free( (void*)ptr ); + ptr = MemRead( &item->callstackAlloc.ptr ); + SendCallstackAlloc( ptr ); + tracy_free( (void*)ptr ); break; default: assert( false );