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

Perform bulk insertion of plot points.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-10-19 23:26:21 +02:00
parent cc1715ae98
commit b7800be627
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/TracyView.cpp
View File

@ -381,6 +381,8 @@ void View::Worker()
DispatchProcess( ev );
}
HandlePostponedPlots();
auto t1 = std::chrono::high_resolution_clock::now();
auto td = std::chrono::duration_cast<std::chrono::milliseconds>( t1 - t0 ).count();
enum { MbpsUpdateTime = 200 };
@ -1038,8 +1040,7 @@ void View::InsertPlot( PlotData* plot, PlotItem* item )
{
if( plot->min > val ) plot->min = val;
else if( plot->max < val ) plot->max = val;
auto it = std::lower_bound( plot->data.begin(), plot->data.end(), time, [] ( const auto& lhs, const auto& rhs ) { return lhs->time < rhs; } );
plot->data.insert( it, item );
plot->postpone.push_back( item );
}
}
@ -1073,6 +1074,26 @@ void View::HandlePlotName( uint64_t name, std::string&& str )
m_pendingPlots.erase( pit );
}
void View::HandlePostponedPlots()
{
for( auto& plot : m_plots )
{
auto& src = plot->postpone;
if( src.empty() ) continue;
auto& dst = plot->data;
std::sort( src.begin(), src.end(), [] ( const auto& l, const auto& r ) { return l->time < r->time; } );
const auto ds = std::lower_bound( dst.begin(), dst.end(), src.front()->time, [] ( const auto& l, const auto& r ) { return l->time < r; } );
const auto dsd = std::distance( dst.begin(), ds ) ;
const auto de = std::lower_bound( ds, dst.end(), src.back()->time, [] ( const auto& l, const auto& r ) { return l->time < r; } );
const auto ded = std::distance( dst.begin(), de );
std::unique_lock<std::mutex> lock( m_lock );
dst.insert( de, src.begin(), src.end() );
std::inplace_merge( dst.begin() + dsd, dst.begin() + ded, dst.begin() + ded + src.size(), [] ( const auto& l, const auto& r ) { return l->time < r->time; } );
lock.unlock();
src.clear();
}
}
uint64_t View::GetFrameTime( size_t idx ) const
{
if( idx < m_frames.size() - 1 )

2
server/TracyView.hpp
View File

@ -88,6 +88,7 @@ private:
double max;
bool enabled;
Vector<PlotItem*> data;
Vector<PlotItem*> postpone;
};
void Worker();
@ -132,6 +133,7 @@ private:
void InsertPlot( PlotData* plot, int64_t time, double val );
void InsertPlot( PlotData* plot, PlotItem* item );
void HandlePlotName( uint64_t name, std::string&& str );
void HandlePostponedPlots();
uint64_t GetFrameTime( size_t idx ) const;
uint64_t GetFrameBegin( size_t idx ) const;