mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract callstack merging.

Browse Source
This commit is contained in:
Bartosz Taudul 2021-11-27 15:06:58 +01:00
parent 58d5fb2ff4
commit 4f735e1ae2
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
2 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
server/TracyWorker.cpp
View File

@ -4261,6 +4261,39 @@ void Worker::AddCallstackAllocPayload( uint64_t ptr, const char* data, size_t _s
m_pendingCallstackId = idx; m_pendingCallstackId = idx;
} }
uint32_t Worker::MergeCallstacks( uint32_t first, uint32_t second )
{
const auto& cs1 = GetCallstack( first );
const auto& cs2 = GetCallstack( second );
const auto sz1 = cs1.size();
const auto sz2 = cs2.size();
const auto tsz = sz1 + sz2;
size_t memsize = sizeof( VarArray<CallstackFrameId> ) + tsz * sizeof( CallstackFrameId );
auto mem = (char*)m_slab.AllocRaw( memsize );
memcpy( mem, cs1.data(), sizeof( CallstackFrameId ) * sz1 );
memcpy( mem + sizeof( CallstackFrameId ) * sz1, cs2.data(), sizeof( CallstackFrameId ) * sz2 );
VarArray<CallstackFrameId>* arr = (VarArray<CallstackFrameId>*)( mem + tsz * sizeof( CallstackFrameId ) );
new(arr) VarArray<CallstackFrameId>( tsz, (CallstackFrameId*)mem );
uint32_t idx;
auto it = m_data.callstackMap.find( arr );
if( it == m_data.callstackMap.end() )
{
idx = m_data.callstackPayload.size();
m_data.callstackMap.emplace( arr, idx );
m_data.callstackPayload.push_back( arr );
}
else
{
idx = it->second;
m_slab.Unalloc( memsize );
}
return idx;
}
void Worker::InsertPlot( PlotData* plot, int64_t time, double val ) void Worker::InsertPlot( PlotData* plot, int64_t time, double val )
{ {
if( plot->data.empty() ) if( plot->data.empty() )
@ -6412,36 +6445,8 @@ void Worker::ProcessCallstackSample( const QueueCallstackSample& ev )
{ {
if( pendingTime == t ) if( pendingTime == t )
{ {
const auto& cs1 = GetCallstack( td.pendingSample.callstack.Val() ); const auto mcs = MergeCallstacks( td.pendingSample.callstack.Val(), callstack );
const auto& cs2 = GetCallstack( callstack ); sd.callstack.SetVal( mcs );
const auto sz1 = cs1.size();
const auto sz2 = cs2.size();
const auto tsz = sz1 + sz2;
size_t memsize = sizeof( VarArray<CallstackFrameId> ) + tsz * sizeof( CallstackFrameId );
auto mem = (char*)m_slab.AllocRaw( memsize );
memcpy( mem, cs1.data(), sizeof( CallstackFrameId ) * sz1 );
memcpy( mem + sizeof( CallstackFrameId ) * sz1, cs2.data(), sizeof( CallstackFrameId ) * sz2 );
VarArray<CallstackFrameId>* arr = (VarArray<CallstackFrameId>*)( mem + tsz * sizeof( CallstackFrameId ) );
new(arr) VarArray<CallstackFrameId>( tsz, (CallstackFrameId*)mem );
uint32_t idx;
auto it = m_data.callstackMap.find( arr );
if( it == m_data.callstackMap.end() )
{
idx = m_data.callstackPayload.size();
m_data.callstackMap.emplace( arr, idx );
m_data.callstackPayload.push_back( arr );
}
else
{
idx = it->second;
m_slab.Unalloc( memsize );
}
sd.callstack.SetVal( idx );
ProcessCallstackSampleImpl( sd, td ); ProcessCallstackSampleImpl( sd, td );
td.pendingSample.time.Clear(); td.pendingSample.time.Clear();
} }

1
server/TracyWorker.hpp
View File

@ -816,6 +816,7 @@ private:
tracy_force_inline void AddCallstackPayload( uint64_t ptr, const char* data, size_t sz ); tracy_force_inline void AddCallstackPayload( uint64_t ptr, const char* data, size_t sz );
tracy_force_inline void AddCallstackAllocPayload( uint64_t ptr, const char* data, size_t sz ); tracy_force_inline void AddCallstackAllocPayload( uint64_t ptr, const char* data, size_t sz );
uint32_t MergeCallstacks( uint32_t first, uint32_t second );
void InsertPlot( PlotData* plot, int64_t time, double val ); void InsertPlot( PlotData* plot, int64_t time, double val );
void HandlePlotName( uint64_t name, const char* str, size_t sz ); void HandlePlotName( uint64_t name, const char* str, size_t sz );