mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 07:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use in-place merge to sort symbol data.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-09-07 01:47:11 +02:00
parent 813e45198d
commit 75ae14cd04
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/TracyWorker.cpp
View File

@ -2686,23 +2686,27 @@ void Worker::Exec()
m_data.newFramesWereReceived = false; m_data.newFramesWereReceived = false;
} }
#endif #endif
if( m_data.newSymbolsWereAdded ) if( m_data.newSymbolsIndex >= 0 )
{ {
m_data.newSymbolsWereAdded = false;
#ifdef NO_PARALLEL_SORT #ifdef NO_PARALLEL_SORT
pdqsort_branchless( m_data.symbolLoc.begin(), m_data.symbolLoc.end(), [] ( const auto& l, const auto& r ) { return l.addr < r.addr; } ); pdqsort_branchless( m_data.symbolLoc.begin() + m_data.newSymbolsIndex, m_data.symbolLoc.end(), [] ( const auto& l, const auto& r ) { return l.addr < r.addr; } );
#else #else
std::sort( std::execution::par_unseq, m_data.symbolLoc.begin(), m_data.symbolLoc.end(), [] ( const auto& l, const auto& r ) { return l.addr < r.addr; } ); std::sort( std::execution::par_unseq, m_data.symbolLoc.begin() + m_data.newSymbolsIndex, m_data.symbolLoc.end(), [] ( const auto& l, const auto& r ) { return l.addr < r.addr; } );
#endif #endif
const auto ms = std::lower_bound( m_data.symbolLoc.begin(), m_data.symbolLoc.begin() + m_data.newSymbolsIndex, m_data.symbolLoc[m_data.newSymbolsIndex], [] ( const auto& l, const auto& r ) { return l.addr < r.addr; } );
std::inplace_merge( ms, m_data.symbolLoc.begin() + m_data.newSymbolsIndex, m_data.symbolLoc.end(), [] ( const auto& l, const auto& r ) { return l.addr < r.addr; } );
m_data.newSymbolsIndex = -1;
} }
if( m_data.newInlineSymbolsWereAdded ) if( m_data.newInlineSymbolsIndex >= 0 )
{ {
m_data.newInlineSymbolsWereAdded = false;
#ifdef NO_PARALLEL_SORT #ifdef NO_PARALLEL_SORT
pdqsort_branchless( m_data.symbolLocInline.begin(), m_data.symbolLocInline.end() ); pdqsort_branchless( m_data.symbolLocInline.begin() + m_data.newInlineSymbolsIndex, m_data.symbolLocInline.end() );
#else #else
std::sort( std::execution::par_unseq, m_data.symbolLocInline.begin(), m_data.symbolLocInline.end() ); std::sort( std::execution::par_unseq, m_data.symbolLocInline.begin() + m_data.newInlineSymbolsIndex, m_data.symbolLocInline.end() );
#endif #endif
const auto ms = std::lower_bound( m_data.symbolLocInline.begin(), m_data.symbolLocInline.begin() + m_data.newInlineSymbolsIndex, m_data.symbolLocInline[m_data.newInlineSymbolsIndex] );
std::inplace_merge( ms, m_data.symbolLocInline.begin() + m_data.newInlineSymbolsIndex, m_data.symbolLocInline.end() );
m_data.newInlineSymbolsIndex = -1;
} }
if( !m_serverQueryQueue.empty() && m_serverQuerySpaceLeft > 0 ) if( !m_serverQueryQueue.empty() && m_serverQuerySpaceLeft > 0 )
@ -5602,12 +5606,12 @@ void Worker::ProcessSymbolInformation( const QueueSymbolInformation& ev )
if( !it->second.isInline ) if( !it->second.isInline )
{ {
if( !m_data.newSymbolsWereAdded ) m_data.newSymbolsWereAdded = true; if( m_data.newSymbolsIndex < 0 ) m_data.newSymbolsIndex = int64_t( m_data.symbolLoc.size() );
m_data.symbolLoc.push_back( SymbolLocation { ev.symAddr, it->second.size } ); m_data.symbolLoc.push_back( SymbolLocation { ev.symAddr, it->second.size } );
} }
else else
{ {
if( !m_data.newInlineSymbolsWereAdded ) m_data.newInlineSymbolsWereAdded = true; if( m_data.newInlineSymbolsIndex < 0 ) m_data.newInlineSymbolsIndex = int64_t( m_data.symbolLocInline.size() );
m_data.symbolLocInline.push_back( ev.symAddr ); m_data.symbolLocInline.push_back( ev.symAddr );
} }

4
server/TracyWorker.hpp
View File

@ -277,8 +277,8 @@ private:
unordered_flat_map<uint64_t, SymbolStats> symbolStats; unordered_flat_map<uint64_t, SymbolStats> symbolStats;
Vector<SymbolLocation> symbolLoc; Vector<SymbolLocation> symbolLoc;
Vector<uint64_t> symbolLocInline; Vector<uint64_t> symbolLocInline;
bool newSymbolsWereAdded = false; int64_t newSymbolsIndex = -1;
bool newInlineSymbolsWereAdded = false; int64_t newInlineSymbolsIndex = -1;
#ifndef TRACY_NO_STATISTICS #ifndef TRACY_NO_STATISTICS
unordered_flat_map<VarArray<CallstackFrameId>*, uint32_t, VarArrayHasher<CallstackFrameId>, VarArrayComparator<CallstackFrameId>> parentCallstackMap; unordered_flat_map<VarArray<CallstackFrameId>*, uint32_t, VarArrayHasher<CallstackFrameId>, VarArrayComparator<CallstackFrameId>> parentCallstackMap;