mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-02 21:53:52 +00:00
Code Issues Releases Wiki Activity

Rewrite ghost zone folding.

Browse Source
This commit is contained in:
Bartosz Taudul 2023-03-23 00:04:12 +01:00
parent c75b62e3d6
commit 527b5f3311
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
server/TracyTimelineItemThread.cpp
View File

@ -323,45 +323,40 @@ void TimelineItemThread::Preprocess( const TimelineContext& ctx, TaskDispatch& t
#ifndef TRACY_NO_STATISTICS #ifndef TRACY_NO_STATISTICS
int TimelineItemThread::PreprocessGhostLevel( const TimelineContext& ctx, const Vector<GhostZone>& vec, int depth ) int TimelineItemThread::PreprocessGhostLevel( const TimelineContext& ctx, const Vector<GhostZone>& vec, int depth )
{ {
const auto pxns = ctx.pxns;
const auto nspx = ctx.nspx; const auto nspx = ctx.nspx;
const auto vStart = ctx.vStart; const auto vStart = ctx.vStart;
const auto vEnd = ctx.vEnd; const auto vEnd = ctx.vEnd;
auto it = std::lower_bound( vec.begin(), vec.end(), std::max<int64_t>( 0, vStart - 2 * MinVisSize * nspx ), [] ( const auto& l, const auto& r ) { return l.end.Val() < r; } ); const auto MinVisNs = int64_t( round( MinVisSize * nspx ) );
auto it = std::lower_bound( vec.begin(), vec.end(), std::max<int64_t>( 0, vStart - 2 * MinVisNs ), [] ( const auto& l, const auto& r ) { return l.end.Val() < r; } );
if( it == vec.end() ) return depth; if( it == vec.end() ) return depth;
const auto zitend = std::lower_bound( it, vec.end(), vEnd, [] ( const auto& l, const auto& r ) { return l.start.Val() < r; } ); const auto zitend = std::lower_bound( it, vec.end(), vEnd, [] ( const auto& l, const auto& r ) { return l.start.Val() < r; } );
if( it == zitend ) return depth; if( it == zitend ) return depth;
if( (zitend-1)->end.Val() < vStart ) return depth; if( (zitend-1)->end.Val() < vStart ) return depth;
const auto MinVisNs = MinVisSize * nspx;
int maxdepth = depth + 1; int maxdepth = depth + 1;
while( it < zitend ) while( it < zitend )
{ {
auto& ev = *it; auto& ev = *it;
const auto end = ev.end.Val(); const auto end = ev.end.Val();
const auto zsz = std::max( ( end - ev.start.Val() ) * pxns, pxns * 0.5 ); const auto zsz = end - ev.start.Val();
if( zsz < MinVisSize ) if( zsz < MinVisNs )
{ {
auto px1ns = ev.end.Val() - vStart;
auto rend = end;
auto nextTime = end + MinVisNs; auto nextTime = end + MinVisNs;
auto next = it + 1;
for(;;) for(;;)
{ {
const auto prevIt = it; next = std::lower_bound( next, zitend, nextTime, [] ( const auto& l, const auto& r ) { return l.end.Val() < r; } );
it = std::lower_bound( it, zitend, nextTime, [] ( const auto& l, const auto& r ) { return l.end.Val() < r; } ); if( next == zitend ) break;
if( it == prevIt ) ++it; const auto nt = next->end.Val();
if( it == zitend ) break; if( nt - nextTime >= MinVisNs ) break;
const auto nend = it->end.Val(); nextTime = nt + MinVisNs;
const auto nsnext = nend - vStart;
if( nsnext - px1ns >= MinVisNs * 2 ) break;
px1ns = nsnext;
rend = nend;
nextTime = nend + nspx;
} }
m_draw.emplace_back( TimelineDraw { TimelineDrawType::GhostFolded, uint16_t( depth ), (void**)&ev, rend } ); m_draw.emplace_back( TimelineDraw { TimelineDrawType::GhostFolded, uint16_t( depth ), (void**)&ev, (next-1)->end } );
it = next;
} }
else else
{ {

3
server/TracyView_ZoneTimeline.cpp
View File

@ -29,7 +29,6 @@ bool View::DrawThread( const TimelineContext& ctx, const ThreadData& thread, con
const auto ty = ctx.ty; const auto ty = ctx.ty;
const auto ostep = ty + 1; const auto ostep = ty + 1;
const auto pxns = ctx.pxns; const auto pxns = ctx.pxns;
const auto nspx = ctx.nspx;
const auto hover = ctx.hover; const auto hover = ctx.hover;
const auto yMin = ctx.yMin; const auto yMin = ctx.yMin;
const auto yMax = ctx.yMax; const auto yMax = ctx.yMax;
@ -446,7 +445,7 @@ void View::DrawZoneList( const TimelineContext& ctx, const std::vector<TimelineD
const auto color = m_vd.dynamicColors == 2 ? 0xFF666666 : MixGhostColor( GetThreadColor( tid, v.depth ), 0x665555 ); const auto color = m_vd.dynamicColors == 2 ? 0xFF666666 : MixGhostColor( GetThreadColor( tid, v.depth ), 0x665555 );
const auto rend = v.rend.Val(); const auto rend = v.rend.Val();
const auto px0 = ( ev.start.Val() - m_vd.zvStart ) * pxns; const auto px0 = ( ev.start.Val() - m_vd.zvStart ) * pxns;
const auto px1 = ( rend - ev.end.Val() ) * pxns; const auto px1 = ( rend - m_vd.zvStart ) * pxns;
draw->AddRectFilled( wpos + ImVec2( std::max( px0, -10.0 ), offset ), wpos + ImVec2( std::min( std::max( px1, px0+MinVisSize ), double( w + 10 ) ), offset + ty ), color ); draw->AddRectFilled( wpos + ImVec2( std::max( px0, -10.0 ), offset ), wpos + ImVec2( std::min( std::max( px1, px0+MinVisSize ), double( w + 10 ) ), offset + ty ), color );
DrawZigZag( draw, wpos + ImVec2( 0, offset + ty/2 ), std::max( px0, -10.0 ), std::min( std::max( px1, px0+MinVisSize ), double( w + 10 ) ), ty/4, DarkenColor( color ) ); DrawZigZag( draw, wpos + ImVec2( 0, offset + ty/2 ), std::max( px0, -10.0 ), std::min( std::max( px1, px0+MinVisSize ), double( w + 10 ) ), ty/4, DarkenColor( color ) );
if( hover && ImGui::IsMouseHoveringRect( wpos + ImVec2( std::max( px0, -10.0 ), offset ), wpos + ImVec2( std::min( std::max( px1, px0+MinVisSize ), double( w + 10 ) ), offset + ty + 1 ) ) ) if( hover && ImGui::IsMouseHoveringRect( wpos + ImVec2( std::max( px0, -10.0 ), offset ), wpos + ImVec2( std::min( std::max( px1, px0+MinVisSize ), double( w + 10 ) ), offset + ty + 1 ) ) )