mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-27 00:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge native callstack with the allocated one.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-03-05 19:43:44 +01:00
parent ebf09bebae
commit bc87762012
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/TracyWorker.cpp
View File

@ -2133,7 +2133,7 @@ void Worker::AddCallstackPayload( uint64_t ptr, char* _data, size_t _sz )
void Worker::AddCallstackAllocPayload( uint64_t ptr, char* data, size_t _sz ) void Worker::AddCallstackAllocPayload( uint64_t ptr, char* data, size_t _sz )
{ {
//assert( m_pendingCallstacks.find( ptr ) == m_pendingCallstacks.end() ); assert( m_pendingCallstackPtr != 0 );
CallstackFrameId stack[64]; CallstackFrameId stack[64];
const auto sz = *(uint32_t*)data; data += 4; const auto sz = *(uint32_t*)data; data += 4;
@ -2170,12 +2170,17 @@ void Worker::AddCallstackAllocPayload( uint64_t ptr, char* data, size_t _sz )
stack[i] = id; stack[i] = id;
} }
const auto memsize = sizeof( VarArray<CallstackFrameId> ) + sz * sizeof( CallstackFrameId ); const auto nativeCs = m_data.callstackPayload[m_pendingCallstackId];
const auto nsz = nativeCs->size();
const auto tsz = sz + nsz;
const auto memsize = sizeof( VarArray<CallstackFrameId> ) + tsz * sizeof( CallstackFrameId );
auto mem = (char*)m_slab.AllocRaw( memsize ); auto mem = (char*)m_slab.AllocRaw( memsize );
memcpy( mem, stack, sizeof( CallstackFrameId ) * sz ); memcpy( mem, stack, sizeof( CallstackFrameId ) * sz );
memcpy( mem + sizeof( CallstackFrameId ) * sz, nativeCs->data(), sizeof( CallstackFrameId ) * nsz );
auto arr = (VarArray<CallstackFrameId>*)( mem + sz * sizeof( CallstackFrameId ) ); auto arr = (VarArray<CallstackFrameId>*)( mem + tsz * sizeof( CallstackFrameId ) );
new(arr) VarArray<CallstackFrameId>( sz, (CallstackFrameId*)mem ); new(arr) VarArray<CallstackFrameId>( tsz, (CallstackFrameId*)mem );
uint32_t idx; uint32_t idx;
auto it = m_data.callstackMap.find( arr ); auto it = m_data.callstackMap.find( arr );
@ -2201,7 +2206,8 @@ void Worker::AddCallstackAllocPayload( uint64_t ptr, char* data, size_t _sz )
m_slab.Unalloc( memsize ); m_slab.Unalloc( memsize );
} }
//m_pendingCallstacks.emplace( ptr, idx ); m_pendingCallstackPtr = ptr;
m_pendingCallstackId = idx;
} }
void Worker::InsertPlot( PlotData* plot, int64_t time, double val ) void Worker::InsertPlot( PlotData* plot, int64_t time, double val )
@ -3210,7 +3216,7 @@ void Worker::ProcessCallstack( const QueueCallstack& ev )
void Worker::ProcessCallstackAlloc( const QueueCallstackAlloc& ev ) void Worker::ProcessCallstackAlloc( const QueueCallstackAlloc& ev )
{ {
assert( m_pendingCallstackPtr == ev.nativePtr ); assert( m_pendingCallstackPtr == ev.ptr );
m_pendingCallstackPtr = 0; m_pendingCallstackPtr = 0;
auto nit = m_nextCallstack.find( ev.thread ); auto nit = m_nextCallstack.find( ev.thread );