mirror of
https://github.com/wolfpld/tracy.git
synced 2024-09-20 05:42:18 +00:00
Handle new callstack ordering on server.
This commit is contained in:
Bartosz Taudul
parent
bd31e3d2d6
commit
d5b6befda2
@ -4192,10 +4192,8 @@ bool Worker::Process( const QueueItem& ev )
|
||||
ProcessCallstackMemory();
|
||||
break;
|
||||
case QueueType::Callstack:
|
||||
ProcessCallstack();
|
||||
break;
|
||||
case QueueType::CallstackAlloc:
|
||||
ProcessCallstackAlloc();
|
||||
ProcessCallstack();
|
||||
break;
|
||||
case QueueType::CallstackSample:
|
||||
ProcessCallstackSample( ev.callstackSample );
|
||||
@ -4313,10 +4311,11 @@ void Worker::ProcessZoneBeginCallstack( const QueueZoneBegin& ev )
|
||||
{
|
||||
auto zone = AllocZoneEvent();
|
||||
ProcessZoneBeginImpl( zone, ev );
|
||||
|
||||
auto& next = m_nextCallstack[m_threadCtx];
|
||||
next.type = NextCallstackType::Zone;
|
||||
next.zone = zone;
|
||||
auto it = m_nextCallstack.find( m_threadCtx );
|
||||
assert( it != m_nextCallstack.end() );
|
||||
auto& extra = RequestZoneExtra( *zone );
|
||||
extra.callstack.SetVal( it->second );
|
||||
it->second = 0;
|
||||
}
|
||||
|
||||
void Worker::ProcessZoneBeginAllocSrcLocImpl( ZoneEvent* zone, const QueueZoneBeginLean& ev )
|
||||
@ -4347,10 +4346,11 @@ void Worker::ProcessZoneBeginAllocSrcLocCallstack( const QueueZoneBeginLean& ev
|
||||
{
|
||||
auto zone = AllocZoneEvent();
|
||||
ProcessZoneBeginAllocSrcLocImpl( zone, ev );
|
||||
|
||||
auto& next = m_nextCallstack[m_threadCtx];
|
||||
next.type = NextCallstackType::Zone;
|
||||
next.zone = zone;
|
||||
auto it = m_nextCallstack.find( m_threadCtx );
|
||||
assert( it != m_nextCallstack.end() );
|
||||
auto& extra = RequestZoneExtra( *zone );
|
||||
extra.callstack.SetVal( it->second );
|
||||
it->second = 0;
|
||||
}
|
||||
|
||||
void Worker::ProcessZoneEnd( const QueueZoneEnd& ev )
|
||||
@ -5008,33 +5008,41 @@ void Worker::ProcessMessageLiteralColor( const QueueMessageColorLiteral& ev )
|
||||
void Worker::ProcessMessageCallstack( const QueueMessage& ev )
|
||||
{
|
||||
ProcessMessage( ev );
|
||||
|
||||
auto& next = m_nextCallstack[m_threadCtx];
|
||||
next.type = NextCallstackType::Message;
|
||||
auto it = m_nextCallstack.find( m_threadCtx );
|
||||
assert( it != m_nextCallstack.end() );
|
||||
assert( m_threadCtxData );
|
||||
m_threadCtxData->messages.back()->callstack.SetVal( it->second );
|
||||
it->second = 0;
|
||||
}
|
||||
|
||||
void Worker::ProcessMessageLiteralCallstack( const QueueMessageLiteral& ev )
|
||||
{
|
||||
ProcessMessageLiteral( ev );
|
||||
|
||||
auto& next = m_nextCallstack[m_threadCtx];
|
||||
next.type = NextCallstackType::Message;
|
||||
auto it = m_nextCallstack.find( m_threadCtx );
|
||||
assert( it != m_nextCallstack.end() );
|
||||
assert( m_threadCtxData );
|
||||
m_threadCtxData->messages.back()->callstack.SetVal( it->second );
|
||||
it->second = 0;
|
||||
}
|
||||
|
||||
void Worker::ProcessMessageColorCallstack( const QueueMessageColor& ev )
|
||||
{
|
||||
ProcessMessageColor( ev );
|
||||
|
||||
auto& next = m_nextCallstack[m_threadCtx];
|
||||
next.type = NextCallstackType::Message;
|
||||
auto it = m_nextCallstack.find( m_threadCtx );
|
||||
assert( it != m_nextCallstack.end() );
|
||||
assert( m_threadCtxData );
|
||||
m_threadCtxData->messages.back()->callstack.SetVal( it->second );
|
||||
it->second = 0;
|
||||
}
|
||||
|
||||
void Worker::ProcessMessageLiteralColorCallstack( const QueueMessageColorLiteral& ev )
|
||||
{
|
||||
ProcessMessageLiteralColor( ev );
|
||||
|
||||
auto& next = m_nextCallstack[m_threadCtx];
|
||||
next.type = NextCallstackType::Message;
|
||||
auto it = m_nextCallstack.find( m_threadCtx );
|
||||
assert( it != m_nextCallstack.end() );
|
||||
assert( m_threadCtxData );
|
||||
m_threadCtxData->messages.back()->callstack.SetVal( it->second );
|
||||
it->second = 0;
|
||||
}
|
||||
|
||||
void Worker::ProcessMessageAppInfo( const QueueMessage& ev )
|
||||
@ -5157,10 +5165,10 @@ void Worker::ProcessGpuZoneBeginCallstack( const QueueGpuZoneBegin& ev, bool ser
|
||||
{
|
||||
auto zone = m_slab.Alloc<GpuEvent>();
|
||||
ProcessGpuZoneBeginImpl( zone, ev, serial );
|
||||
|
||||
auto& next = m_nextCallstack[ev.thread];
|
||||
next.type = NextCallstackType::Gpu;
|
||||
next.gpu = zone;
|
||||
auto it = m_nextCallstack.find( m_threadCtx );
|
||||
assert( it != m_nextCallstack.end() );
|
||||
zone->callstack.SetVal( it->second );
|
||||
it->second = 0;
|
||||
}
|
||||
|
||||
void Worker::ProcessGpuZoneEnd( const QueueGpuZoneEnd& ev, bool serial )
|
||||
@ -5272,7 +5280,7 @@ void Worker::ProcessGpuCalibration( const QueueGpuCalibration& ev )
|
||||
ctx->calibratedCpuTime = TscTime( ev.cpuTime - m_data.baseTime );
|
||||
}
|
||||
|
||||
void Worker::ProcessMemAllocImpl( uint64_t memname, MemData& memdata, const QueueMemAlloc& ev )
|
||||
MemEvent* Worker::ProcessMemAllocImpl( uint64_t memname, MemData& memdata, const QueueMemAlloc& ev )
|
||||
{
|
||||
const auto refTime = m_refTimeSerial + ev.time;
|
||||
m_refTimeSerial = refTime;
|
||||
@ -5309,14 +5317,15 @@ void Worker::ProcessMemAllocImpl( uint64_t memname, MemData& memdata, const Queu
|
||||
memdata.usage += size;
|
||||
|
||||
MemAllocChanged( memname, memdata, time );
|
||||
return &mem;
|
||||
}
|
||||
|
||||
bool Worker::ProcessMemFreeImpl( uint64_t memname, MemData& memdata, const QueueMemFree& ev )
|
||||
MemEvent* Worker::ProcessMemFreeImpl( uint64_t memname, MemData& memdata, const QueueMemFree& ev )
|
||||
{
|
||||
const auto refTime = m_refTimeSerial + ev.time;
|
||||
m_refTimeSerial = refTime;
|
||||
|
||||
if( ev.ptr == 0 ) return false;
|
||||
if( ev.ptr == 0 ) return nullptr;
|
||||
|
||||
auto it = memdata.active.find( ev.ptr );
|
||||
if( it == memdata.active.end() )
|
||||
@ -5326,7 +5335,7 @@ bool Worker::ProcessMemFreeImpl( uint64_t memname, MemData& memdata, const Queue
|
||||
CheckThreadString( ev.thread );
|
||||
MemFreeFailure( ev.thread );
|
||||
}
|
||||
return false;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
const auto time = TscTime( refTime - m_data.baseTime );
|
||||
@ -5340,16 +5349,16 @@ bool Worker::ProcessMemFreeImpl( uint64_t memname, MemData& memdata, const Queue
|
||||
memdata.active.erase( it );
|
||||
|
||||
MemAllocChanged( memname, memdata, time );
|
||||
return true;
|
||||
return &mem;
|
||||
}
|
||||
|
||||
void Worker::ProcessMemAlloc( const QueueMemAlloc& ev )
|
||||
MemEvent* Worker::ProcessMemAlloc( const QueueMemAlloc& ev )
|
||||
{
|
||||
assert( m_memNamePayload == 0 );
|
||||
ProcessMemAllocImpl( 0, *m_data.memory, ev );
|
||||
return ProcessMemAllocImpl( 0, *m_data.memory, ev );
|
||||
}
|
||||
|
||||
void Worker::ProcessMemAllocNamed( const QueueMemAlloc& ev )
|
||||
MemEvent* Worker::ProcessMemAllocNamed( const QueueMemAlloc& ev )
|
||||
{
|
||||
assert( m_memNamePayload != 0 );
|
||||
auto memname = m_memNamePayload;
|
||||
@ -5361,16 +5370,16 @@ void Worker::ProcessMemAllocNamed( const QueueMemAlloc& ev )
|
||||
it = m_data.memNameMap.emplace( memname, m_slab.AllocInit<MemData>() ).first;
|
||||
it->second->name = memname;
|
||||
}
|
||||
ProcessMemAllocImpl( memname, *it->second, ev );
|
||||
return ProcessMemAllocImpl( memname, *it->second, ev );
|
||||
}
|
||||
|
||||
bool Worker::ProcessMemFree( const QueueMemFree& ev )
|
||||
MemEvent* Worker::ProcessMemFree( const QueueMemFree& ev )
|
||||
{
|
||||
assert( m_memNamePayload == 0 );
|
||||
return ProcessMemFreeImpl( 0, *m_data.memory, ev );
|
||||
}
|
||||
|
||||
bool Worker::ProcessMemFreeNamed( const QueueMemFree& ev )
|
||||
MemEvent* Worker::ProcessMemFreeNamed( const QueueMemFree& ev )
|
||||
{
|
||||
assert( m_memNamePayload != 0 );
|
||||
auto memname = m_memNamePayload;
|
||||
@ -5387,10 +5396,11 @@ bool Worker::ProcessMemFreeNamed( const QueueMemFree& ev )
|
||||
|
||||
void Worker::ProcessMemAllocCallstack( const QueueMemAlloc& ev )
|
||||
{
|
||||
m_lastMemActionData = m_data.memory;
|
||||
m_lastMemActionCallstack = m_data.memory->data.size();
|
||||
ProcessMemAlloc( ev );
|
||||
m_lastMemActionWasAlloc = true;
|
||||
auto mem = ProcessMemAlloc( ev );
|
||||
assert( mem );
|
||||
assert( m_memNextCallstack != 0 );
|
||||
mem->SetCsAlloc( m_memNextCallstack );
|
||||
m_memNextCallstack = 0;
|
||||
}
|
||||
|
||||
void Worker::ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev )
|
||||
@ -5405,24 +5415,19 @@ void Worker::ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev )
|
||||
it = m_data.memNameMap.emplace( memname, m_slab.AllocInit<MemData>() ).first;
|
||||
it->second->name = memname;
|
||||
}
|
||||
m_lastMemActionData = it->second;
|
||||
m_lastMemActionCallstack = it->second->data.size();
|
||||
ProcessMemAllocImpl( memname, *it->second, ev );
|
||||
m_lastMemActionWasAlloc = true;
|
||||
auto mem = ProcessMemAllocImpl( memname, *it->second, ev );
|
||||
assert( mem );
|
||||
assert( m_memNextCallstack != 0 );
|
||||
mem->SetCsAlloc( m_memNextCallstack );
|
||||
m_memNextCallstack = 0;
|
||||
}
|
||||
|
||||
void Worker::ProcessMemFreeCallstack( const QueueMemFree& ev )
|
||||
{
|
||||
if( ProcessMemFree( ev ) )
|
||||
{
|
||||
m_lastMemActionData = m_data.memory;
|
||||
m_lastMemActionCallstack = m_data.memory->frees.back();
|
||||
m_lastMemActionWasAlloc = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_lastMemActionCallstack = std::numeric_limits<uint64_t>::max();
|
||||
}
|
||||
auto mem = ProcessMemFree( ev );
|
||||
assert( m_memNextCallstack != 0 );
|
||||
if( mem ) mem->csFree.SetVal( m_memNextCallstack );
|
||||
m_memNextCallstack = 0;
|
||||
}
|
||||
|
||||
void Worker::ProcessMemFreeCallstackNamed( const QueueMemFree& ev )
|
||||
@ -5437,109 +5442,28 @@ void Worker::ProcessMemFreeCallstackNamed( const QueueMemFree& ev )
|
||||
it = m_data.memNameMap.emplace( memname, m_slab.AllocInit<MemData>() ).first;
|
||||
it->second->name = memname;
|
||||
}
|
||||
if( ProcessMemFreeImpl( memname, *it->second, ev ) )
|
||||
{
|
||||
m_lastMemActionData = it->second;
|
||||
m_lastMemActionCallstack = it->second->frees.back();
|
||||
m_lastMemActionWasAlloc = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_lastMemActionCallstack = std::numeric_limits<uint64_t>::max();
|
||||
}
|
||||
auto mem = ProcessMemFreeImpl( memname, *it->second, ev );
|
||||
assert( m_memNextCallstack != 0 );
|
||||
if( mem ) mem->csFree.SetVal( m_memNextCallstack );
|
||||
m_memNextCallstack = 0;
|
||||
}
|
||||
|
||||
void Worker::ProcessCallstackMemory()
|
||||
{
|
||||
assert( m_pendingCallstackPtr != 0 );
|
||||
m_pendingCallstackPtr = 0;
|
||||
|
||||
if( m_lastMemActionCallstack != std::numeric_limits<uint64_t>::max() )
|
||||
{
|
||||
auto& mem = m_lastMemActionData->data[m_lastMemActionCallstack];
|
||||
if( m_lastMemActionWasAlloc )
|
||||
{
|
||||
mem.SetCsAlloc( m_pendingCallstackId );
|
||||
}
|
||||
else
|
||||
{
|
||||
mem.csFree.SetVal( m_pendingCallstackId );
|
||||
}
|
||||
}
|
||||
assert( m_memNextCallstack == 0 );
|
||||
m_memNextCallstack = m_pendingCallstackId;
|
||||
}
|
||||
|
||||
void Worker::ProcessCallstack()
|
||||
{
|
||||
assert( m_pendingCallstackPtr != 0 );
|
||||
m_pendingCallstackPtr = 0;
|
||||
|
||||
auto nit = m_nextCallstack.find( m_threadCtx );
|
||||
assert( nit != m_nextCallstack.end() );
|
||||
auto& next = nit->second;
|
||||
|
||||
switch( next.type )
|
||||
{
|
||||
case NextCallstackType::Zone:
|
||||
{
|
||||
auto& extra = RequestZoneExtra( *next.zone );
|
||||
extra.callstack.SetVal( m_pendingCallstackId );
|
||||
break;
|
||||
}
|
||||
case NextCallstackType::Gpu:
|
||||
next.gpu->callstack.SetVal( m_pendingCallstackId );
|
||||
break;
|
||||
case NextCallstackType::Crash:
|
||||
m_data.crashEvent.callstack = m_pendingCallstackId;
|
||||
break;
|
||||
case NextCallstackType::Message:
|
||||
{
|
||||
auto td = m_threadCtxData;
|
||||
if( !td ) td = m_threadCtxData = RetrieveThread( m_threadCtx );
|
||||
assert( td );
|
||||
td->messages.back()->callstack.SetVal( m_pendingCallstackId );
|
||||
break;
|
||||
}
|
||||
default:
|
||||
assert( false );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Worker::ProcessCallstackAlloc()
|
||||
{
|
||||
assert( m_pendingCallstackPtr != 0 );
|
||||
m_pendingCallstackPtr = 0;
|
||||
|
||||
auto nit = m_nextCallstack.find( m_threadCtx );
|
||||
assert( nit != m_nextCallstack.end() );
|
||||
auto& next = nit->second;
|
||||
|
||||
switch( next.type )
|
||||
{
|
||||
case NextCallstackType::Zone:
|
||||
{
|
||||
auto& extra = RequestZoneExtra( *next.zone );
|
||||
extra.callstack.SetVal( m_pendingCallstackId );
|
||||
break;
|
||||
}
|
||||
case NextCallstackType::Gpu:
|
||||
next.gpu->callstack.SetVal( m_pendingCallstackId );
|
||||
break;
|
||||
case NextCallstackType::Crash:
|
||||
m_data.crashEvent.callstack = m_pendingCallstackId;
|
||||
break;
|
||||
case NextCallstackType::Message:
|
||||
{
|
||||
auto td = m_threadCtxData;
|
||||
if( !td ) td = m_threadCtxData = RetrieveThread( m_threadCtx );
|
||||
assert( td );
|
||||
td->messages.back()->callstack.SetVal( m_pendingCallstackId );
|
||||
break;
|
||||
}
|
||||
default:
|
||||
assert( false );
|
||||
break;
|
||||
}
|
||||
auto it = m_nextCallstack.find( m_threadCtx );
|
||||
if( it == m_nextCallstack.end() ) it = m_nextCallstack.emplace( m_threadCtx, 0 ).first;
|
||||
assert( it->second == 0 );
|
||||
it->second = m_pendingCallstackId;
|
||||
}
|
||||
|
||||
void Worker::ProcessCallstackSample( const QueueCallstackSample& ev )
|
||||
@ -5843,14 +5767,21 @@ void Worker::ProcessCrashReport( const QueueCrashReport& ev )
|
||||
{
|
||||
CheckString( ev.text );
|
||||
|
||||
auto& next = m_nextCallstack[m_threadCtx];
|
||||
next.type = NextCallstackType::Crash;
|
||||
|
||||
m_data.crashEvent.thread = m_threadCtx;
|
||||
m_data.crashEvent.time = TscTime( ev.time - m_data.baseTime );
|
||||
m_data.crashEvent.message = ev.text;
|
||||
|
||||
auto it = m_nextCallstack.find( m_threadCtx );
|
||||
if( it != m_nextCallstack.end() && it->second != 0 )
|
||||
{
|
||||
m_data.crashEvent.callstack = it->second;
|
||||
it->second = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_data.crashEvent.callstack = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void Worker::ProcessSysTime( const QueueSysTime& ev )
|
||||
{
|
||||
|
||||
@ -363,24 +363,6 @@ private:
|
||||
uint64_t transferred;
|
||||
};
|
||||
|
||||
enum class NextCallstackType
|
||||
{
|
||||
Zone,
|
||||
Gpu,
|
||||
Crash,
|
||||
Message
|
||||
};
|
||||
|
||||
struct NextCallstack
|
||||
{
|
||||
NextCallstackType type;
|
||||
union
|
||||
{
|
||||
ZoneEvent* zone;
|
||||
GpuEvent* gpu;
|
||||
};
|
||||
};
|
||||
|
||||
struct FailureData
|
||||
{
|
||||
uint64_t thread;
|
||||
@ -653,17 +635,16 @@ private:
|
||||
tracy_force_inline void ProcessGpuZoneEnd( const QueueGpuZoneEnd& ev, bool serial );
|
||||
tracy_force_inline void ProcessGpuTime( const QueueGpuTime& ev );
|
||||
tracy_force_inline void ProcessGpuCalibration( const QueueGpuCalibration& ev );
|
||||
tracy_force_inline void ProcessMemAlloc( const QueueMemAlloc& ev );
|
||||
tracy_force_inline void ProcessMemAllocNamed( const QueueMemAlloc& ev );
|
||||
tracy_force_inline bool ProcessMemFree( const QueueMemFree& ev );
|
||||
tracy_force_inline bool ProcessMemFreeNamed( const QueueMemFree& ev );
|
||||
tracy_force_inline MemEvent* ProcessMemAlloc( const QueueMemAlloc& ev );
|
||||
tracy_force_inline MemEvent* ProcessMemAllocNamed( const QueueMemAlloc& ev );
|
||||
tracy_force_inline MemEvent* ProcessMemFree( const QueueMemFree& ev );
|
||||
tracy_force_inline MemEvent* ProcessMemFreeNamed( const QueueMemFree& ev );
|
||||
tracy_force_inline void ProcessMemAllocCallstack( const QueueMemAlloc& ev );
|
||||
tracy_force_inline void ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev );
|
||||
tracy_force_inline void ProcessMemFreeCallstack( const QueueMemFree& ev );
|
||||
tracy_force_inline void ProcessMemFreeCallstackNamed( const QueueMemFree& ev );
|
||||
tracy_force_inline void ProcessCallstackMemory();
|
||||
tracy_force_inline void ProcessCallstack();
|
||||
tracy_force_inline void ProcessCallstackAlloc();
|
||||
tracy_force_inline void ProcessCallstackSample( const QueueCallstackSample& ev );
|
||||
tracy_force_inline void ProcessCallstackFrameSize( const QueueCallstackFrameSize& ev );
|
||||
tracy_force_inline void ProcessCallstackFrame( const QueueCallstackFrame& ev );
|
||||
@ -682,8 +663,8 @@ private:
|
||||
tracy_force_inline void ProcessZoneBeginImpl( ZoneEvent* zone, const QueueZoneBegin& ev );
|
||||
tracy_force_inline void ProcessZoneBeginAllocSrcLocImpl( ZoneEvent* zone, const QueueZoneBeginLean& ev );
|
||||
tracy_force_inline void ProcessGpuZoneBeginImpl( GpuEvent* zone, const QueueGpuZoneBegin& ev, bool serial );
|
||||
tracy_force_inline void ProcessMemAllocImpl( uint64_t memname, MemData& memdata, const QueueMemAlloc& ev );
|
||||
tracy_force_inline bool ProcessMemFreeImpl( uint64_t memname, MemData& memdata, const QueueMemFree& ev );
|
||||
tracy_force_inline MemEvent* ProcessMemAllocImpl( uint64_t memname, MemData& memdata, const QueueMemAlloc& ev );
|
||||
tracy_force_inline MemEvent* ProcessMemFreeImpl( uint64_t memname, MemData& memdata, const QueueMemFree& ev );
|
||||
|
||||
void ZoneStackFailure( uint64_t thread, const ZoneEvent* ev );
|
||||
void ZoneDoubleEndFailure( uint64_t thread, const ZoneEvent* ev );
|
||||
@ -869,7 +850,6 @@ private:
|
||||
Vector<uint64_t> m_sourceLocationQueue;
|
||||
unordered_flat_map<uint64_t, int16_t> m_sourceLocationShrink;
|
||||
unordered_flat_map<uint64_t, ThreadData*> m_threadMap;
|
||||
unordered_flat_map<uint64_t, NextCallstack> m_nextCallstack;
|
||||
FrameImagePending m_pendingFrameImageData = {};
|
||||
unordered_flat_map<uint64_t, SymbolPending> m_pendingSymbols;
|
||||
unordered_flat_set<uint64_t> m_pendingSymbolCode;
|
||||
@ -891,9 +871,7 @@ private:
|
||||
uint64_t m_callstackAllocNextIdx = 0;
|
||||
uint64_t m_callstackParentNextIdx = 0;
|
||||
|
||||
uint64_t m_lastMemActionCallstack;
|
||||
bool m_lastMemActionWasAlloc;
|
||||
MemData* m_lastMemActionData;
|
||||
uint32_t m_memNextCallstack = 0;
|
||||
uint64_t m_memNamePayload = 0;
|
||||
|
||||
Slab<64*1024*1024> m_slab;
|
||||
@ -952,6 +930,8 @@ private:
|
||||
|
||||
char* m_tmpBuf = nullptr;
|
||||
size_t m_tmpBufSize = 0;
|
||||
|
||||
unordered_flat_map<uint64_t, uint32_t> m_nextCallstack;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user