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

No need to perform capture here.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-01-06 21:11:36 +01:00
parent fbe8eb3585
commit 13a0ddfe03
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/TracyWorker.cpp
View File

@ -2027,7 +2027,7 @@ void Worker::HandlePlotName( uint64_t name, char* str, size_t sz )
void Worker::HandleFrameName( uint64_t name, char* str, size_t sz ) void Worker::HandleFrameName( uint64_t name, char* str, size_t sz )
{ {
const auto sl = StoreString( str, sz ); const auto sl = StoreString( str, sz );
m_data.frames.StringDiscovered( name, sl, m_data.strings, [this] ( FrameData* dst, FrameData* src ) { m_data.frames.StringDiscovered( name, sl, m_data.strings, [] ( FrameData* dst, FrameData* src ) {
auto sz = dst->frames.size(); auto sz = dst->frames.size();
dst->frames.insert( dst->frames.end(), src->frames.begin(), src->frames.end() ); dst->frames.insert( dst->frames.end(), src->frames.begin(), src->frames.end() );
std::inplace_merge( dst->frames.begin(), dst->frames.begin() + sz, dst->frames.end(), [] ( const auto& lhs, const auto& rhs ) { return lhs.start < rhs.start; } ); std::inplace_merge( dst->frames.begin(), dst->frames.begin() + sz, dst->frames.end(), [] ( const auto& lhs, const auto& rhs ) { return lhs.start < rhs.start; } );