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

Store pointers to PlotItems.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-10-19 21:04:11 +02:00
parent 7329eb6e99
commit 44cc0827d4
2 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
server/TracyView.cpp
View File

@ -269,8 +269,8 @@ View::View( FileRead& f )
pd->data.reserve( psz ); pd->data.reserve( psz );
for( uint64_t j=0; j<psz; j++ ) for( uint64_t j=0; j<psz; j++ )
{ {
PlotItem item; auto item = m_slab.Alloc<PlotItem>();
f.Read( &item, sizeof( item ) ); f.Read( item, sizeof( PlotItem ) );
pd->data.push_back( item ); pd->data.push_back( item );
} }
m_plots.push_back( pd ); m_plots.push_back( pd );
@ -1009,7 +1009,18 @@ void View::UpdateLockCount( LockMap& lockmap, size_t pos )
void View::InsertPlot( PlotData* plot, int64_t time, double val ) void View::InsertPlot( PlotData* plot, int64_t time, double val )
{ {
if( plot->data.empty() || plot->data.back().time < time ) auto item = m_slab.Alloc<PlotItem>();
item->time = time;
item->val = val;
InsertPlot( plot, item );
}
void View::InsertPlot( PlotData* plot, PlotItem* item )
{
const auto& time = item->time;
const auto& val = item->val;
if( plot->data.empty() || plot->data.back()->time < time )
{ {
if( plot->data.empty() ) if( plot->data.empty() )
{ {
@ -1021,14 +1032,14 @@ void View::InsertPlot( PlotData* plot, int64_t time, double val )
if( plot->min > val ) plot->min = val; if( plot->min > val ) plot->min = val;
else if( plot->max < val ) plot->max = val; else if( plot->max < val ) plot->max = val;
} }
plot->data.push_back( PlotItem { time, val } ); plot->data.push_back( item );
} }
else else
{ {
if( plot->min > val ) plot->min = val; if( plot->min > val ) plot->min = val;
else if( plot->max < val ) plot->max = 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; } ); 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, PlotItem { time, val } ); plot->data.insert( it, item );
} }
} }
@ -1053,9 +1064,8 @@ void View::HandlePlotName( uint64_t name, std::string&& str )
auto plot = m_plots[it->second]; auto plot = m_plots[it->second];
for( auto& v : pp ) for( auto& v : pp )
{ {
InsertPlot( plot, v.time, v.val ); InsertPlot( plot, v );
} }
// pit->second is leaked
} }
m_pendingPlots.erase( pit ); m_pendingPlots.erase( pit );
@ -2409,7 +2419,7 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos, bool hover )
v->enabled = !v->enabled; v->enabled = !v->enabled;
} }
const auto tr = v->data.back().time - v->data.begin()->time; const auto tr = v->data.back()->time - v->data.front()->time;
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Text( "Plot \"%s\"", txt ); ImGui::Text( "Plot \"%s\"", txt );
@ -2420,8 +2430,8 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos, bool hover )
ImGui::Text( "Time range: %s", TimeToString( tr ) ); ImGui::Text( "Time range: %s", TimeToString( tr ) );
ImGui::Text( "Data/second: %s", RealToString( double( v->data.size() ) / tr * 1000000000ull, true ) ); ImGui::Text( "Data/second: %s", RealToString( double( v->data.size() ) / tr * 1000000000ull, true ) );
const auto it = std::lower_bound( v->data.begin(), v->data.end(), v->data.back().time - 1000000000ull * 10, [] ( const auto& l, const auto& r ) { return l.time < r; } ); const auto it = std::lower_bound( v->data.begin(), v->data.end(), v->data.back()->time - 1000000000ull * 10, [] ( const auto& l, const auto& r ) { return l->time < r; } );
const auto tr10 = v->data.back().time - it->time; const auto tr10 = v->data.back()->time - (*it)->time;
if( tr10 != 0 ) if( tr10 != 0 )
{ {
ImGui::Text( "D/s (10s): %s", RealToString( double( std::distance( it, v->data.end() ) ) / tr10 * 1000000000ull, true ) ); ImGui::Text( "D/s (10s): %s", RealToString( double( std::distance( it, v->data.end() ) ) / tr10 * 1000000000ull, true ) );
@ -2435,21 +2445,21 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos, bool hover )
if( v->enabled ) if( v->enabled )
{ {
auto& vec = v->data; auto& vec = v->data;
auto it = std::lower_bound( vec.begin(), vec.end(), m_zvStart - m_delay, [] ( const auto& l, const auto& r ) { return l.time < r; } ); auto it = std::lower_bound( vec.begin(), vec.end(), m_zvStart - m_delay, [] ( const auto& l, const auto& r ) { return l->time < r; } );
auto end = std::lower_bound( vec.begin(), vec.end(), m_zvEnd + m_resolution, [] ( const auto& l, const auto& r ) { return l.time < r; } ); auto end = std::lower_bound( vec.begin(), vec.end(), m_zvEnd + m_resolution, [] ( const auto& l, const auto& r ) { return l->time < r; } );
if( end != vec.end() ) end++; if( end != vec.end() ) end++;
if( it != vec.begin() ) it--; if( it != vec.begin() ) it--;
double min = it->val; double min = (*it)->val;
double max = it->val; double max = (*it)->val;
{ {
auto tmp = it; auto tmp = it;
++tmp; ++tmp;
while( tmp != end ) while( tmp != end )
{ {
if( tmp->val < min ) min = tmp->val; if( (*tmp)->val < min ) min = (*tmp)->val;
else if( tmp->val > max ) max = tmp->val; else if( (*tmp)->val > max ) max = (*tmp)->val;
++tmp; ++tmp;
} }
} }
@ -2464,9 +2474,9 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos, bool hover )
if( it == vec.begin() ) if( it == vec.begin() )
{ {
const auto x = ( it->time - m_zvStart ) * pxns; const auto x = ( (*it)->time - m_zvStart ) * pxns;
const auto y = PlotHeight - ( it->val - min ) * revrange * PlotHeight; const auto y = PlotHeight - ( (*it)->val - min ) * revrange * PlotHeight;
DrawPlotPoint( wpos, x, y, offset, 0xFF44DDDD, hover, false, it->val, 0, false ); DrawPlotPoint( wpos, x, y, offset, 0xFF44DDDD, hover, false, (*it)->val, 0, false );
} }
auto prevx = it; auto prevx = it;
@ -2474,19 +2484,19 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos, bool hover )
++it; ++it;
while( it < end ) while( it < end )
{ {
const auto x0 = ( prevx->time - m_zvStart ) * pxns; const auto x0 = ( (*prevx)->time - m_zvStart ) * pxns;
const auto x1 = ( it->time - m_zvStart ) * pxns; const auto x1 = ( (*it)->time - m_zvStart ) * pxns;
const auto y0 = PlotHeight - ( prevy->val - min ) * revrange * PlotHeight; const auto y0 = PlotHeight - ( (*prevy)->val - min ) * revrange * PlotHeight;
const auto y1 = PlotHeight - ( it->val - min ) * revrange * PlotHeight; const auto y1 = PlotHeight - ( (*it)->val - min ) * revrange * PlotHeight;
draw->AddLine( wpos + ImVec2( x0, offset + y0 ), wpos + ImVec2( x1, offset + y1 ), 0xFF44DDDD ); draw->AddLine( wpos + ImVec2( x0, offset + y0 ), wpos + ImVec2( x1, offset + y1 ), 0xFF44DDDD );
auto range = std::upper_bound( it, end, int64_t( it->time + nspx * 2.5 ), [] ( const auto& l, const auto& r ) { return l < r.time; } ); auto range = std::upper_bound( it, end, int64_t( (*it)->time + nspx * 2.5 ), [] ( const auto& l, const auto& r ) { return l < r->time; } );
assert( range > it ); assert( range > it );
const auto rsz = std::distance( it, range ); const auto rsz = std::distance( it, range );
if( rsz == 1 ) if( rsz == 1 )
{ {
DrawPlotPoint( wpos, x1, y1, offset, 0xFF44DDDD, hover, true, it->val, prevy->val, false ); DrawPlotPoint( wpos, x1, y1, offset, 0xFF44DDDD, hover, true, (*it)->val, (*prevy)->val, false );
prevx = it; prevx = it;
prevy = it; prevy = it;
++it; ++it;
@ -2508,7 +2518,7 @@ int View::DrawPlots( int offset, double pxns, const ImVec2& wpos, bool hover )
auto dst = m_tmpVec; auto dst = m_tmpVec;
for(;;) for(;;)
{ {
*dst++ = float( it->val ); *dst++ = float( (*it)->val );
if( std::distance( it, range ) > skip ) if( std::distance( it, range ) > skip )
{ {
it += skip; it += skip;
@ -2943,7 +2953,10 @@ void View::Write( FileWrite& f )
f.Write( &plot->max, sizeof( plot->max ) ); f.Write( &plot->max, sizeof( plot->max ) );
sz = plot->data.size(); sz = plot->data.size();
f.Write( &sz, sizeof( sz ) ); f.Write( &sz, sizeof( sz ) );
f.Write( plot->data.data(), sizeof( PlotItem ) * sz ); for( auto& item : plot->data )
{
f.Write( item, sizeof( PlotItem ) );
}
} }
} }

3
server/TracyView.hpp
View File

@ -87,7 +87,7 @@ private:
double min; double min;
double max; double max;
bool enabled; bool enabled;
Vector<PlotItem> data; Vector<PlotItem*> data;
}; };
void Worker(); void Worker();
@ -130,6 +130,7 @@ private:
void UpdateLockCount( LockMap& lockmap, size_t pos ); void UpdateLockCount( LockMap& lockmap, size_t pos );
void InsertPlot( PlotData* plot, int64_t time, double val ); void InsertPlot( PlotData* plot, int64_t time, double val );
void InsertPlot( PlotData* plot, PlotItem* item );
void HandlePlotName( uint64_t name, std::string&& str ); void HandlePlotName( uint64_t name, std::string&& str );
uint64_t GetFrameTime( size_t idx ) const; uint64_t GetFrameTime( size_t idx ) const;