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

Zones can be now also grouped by call stack.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-07-21 20:26:13 +02:00
parent 3c6baf53da
commit 9291a88020
3 changed files with 74 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
server/TracyView.cpp
View File

@ -3641,6 +3641,23 @@ void View::DrawMessages()
ImGui::End(); ImGui::End();
} }
uint64_t View::GetSelectionTarget( const Worker::ZoneThreadData& ev, FindZone::GroupBy groupBy ) const
{
uint64_t target;
switch( groupBy )
{
case FindZone::GroupBy::Thread:
return ev.thread;
case FindZone::GroupBy::UserText:
return ev.zone->text.active ? ev.zone->text.idx : std::numeric_limits<uint64_t>::max();
case FindZone::GroupBy::Callstack:
return ev.zone->callstack;
default:
assert( false );
return 0;
}
}
void View::DrawFindZone() void View::DrawFindZone()
{ {
ImGui::Begin( "Find Zone", &m_findZone.show ); ImGui::Begin( "Find Zone", &m_findZone.show );
@ -3734,7 +3751,7 @@ void View::DrawFindZone()
const auto dt = double( tmax - tmin ); const auto dt = double( tmax - tmin );
const auto selThread = m_findZone.selThread; const auto selThread = m_findZone.selThread;
const auto showThreads = m_findZone.showThreads; const auto groupBy = m_findZone.groupBy;
const auto cumulateTime = m_findZone.cumulateTime; const auto cumulateTime = m_findZone.cumulateTime;
if( dt > 0 ) if( dt > 0 )
@ -3782,7 +3799,7 @@ void View::DrawFindZone()
const auto bin = std::min( numBins - 1, int64_t( ( log10fast( timeSpan ) - tMinLog ) * idt ) ); const auto bin = std::min( numBins - 1, int64_t( ( log10fast( timeSpan ) - tMinLog ) * idt ) );
bins[bin]++; bins[bin]++;
binTime[bin] += timeSpan; binTime[bin] += timeSpan;
if( selThread == ( showThreads ? ev.thread : ( ev.zone->text.active ? ev.zone->text.idx : std::numeric_limits<uint64_t>::max() ) ) ) if( selThread == GetSelectionTarget( ev, groupBy ) )
{ {
if( cumulateTime ) selBin[bin] += timeSpan; else selBin[bin]++; if( cumulateTime ) selBin[bin] += timeSpan; else selBin[bin]++;
selBinTime += timeSpan; selBinTime += timeSpan;
@ -3802,7 +3819,7 @@ void View::DrawFindZone()
const auto bin = std::min( numBins - 1, int64_t( ( timeSpan - tmin ) * idt ) ); const auto bin = std::min( numBins - 1, int64_t( ( timeSpan - tmin ) * idt ) );
bins[bin]++; bins[bin]++;
binTime[bin] += timeSpan; binTime[bin] += timeSpan;
if( selThread == ( showThreads ? ev.thread : ( ev.zone->text.active ? ev.zone->text.idx : std::numeric_limits<uint64_t>::max() ) ) ) if( selThread == GetSelectionTarget( ev, groupBy ) )
{ {
if( cumulateTime ) selBin[bin] += timeSpan; else selBin[bin]++; if( cumulateTime ) selBin[bin] += timeSpan; else selBin[bin]++;
selBinTime += timeSpan; selBinTime += timeSpan;
@ -3863,7 +3880,7 @@ void View::DrawFindZone()
const auto bin = std::min( numBins - 1, int64_t( ( log10fast( timeSpan ) - tMinLog ) * idt ) ); const auto bin = std::min( numBins - 1, int64_t( ( log10fast( timeSpan ) - tMinLog ) * idt ) );
bins[bin]++; bins[bin]++;
binTime[bin] += timeSpan; binTime[bin] += timeSpan;
if( selThread == ( showThreads ? ev.thread : ( ev.zone->text.active ? ev.zone->text.idx : std::numeric_limits<uint64_t>::max() ) ) ) if( selThread == GetSelectionTarget( ev, groupBy ) )
{ {
if( cumulateTime ) selBin[bin] += timeSpan; else selBin[bin]++; if( cumulateTime ) selBin[bin] += timeSpan; else selBin[bin]++;
selBinTime += timeSpan; selBinTime += timeSpan;
@ -3882,7 +3899,7 @@ void View::DrawFindZone()
const auto bin = std::min( numBins - 1, int64_t( ( timeSpan - tmin ) * idt ) ); const auto bin = std::min( numBins - 1, int64_t( ( timeSpan - tmin ) * idt ) );
bins[bin]++; bins[bin]++;
binTime[bin] += timeSpan; binTime[bin] += timeSpan;
if( selThread == ( showThreads ? ev.thread : ( ev.zone->text.active ? ev.zone->text.idx : std::numeric_limits<uint64_t>::max() ) ) ) if( selThread == GetSelectionTarget( ev, groupBy ) )
{ {
if( cumulateTime ) selBin[bin] += timeSpan; else selBin[bin]++; if( cumulateTime ) selBin[bin] += timeSpan; else selBin[bin]++;
selBinTime += timeSpan; selBinTime += timeSpan;
@ -4222,25 +4239,6 @@ void View::DrawFindZone()
ImGui::Separator(); ImGui::Separator();
ImGui::Text( "Found zones:" ); ImGui::Text( "Found zones:" );
ImGui::SameLine(); ImGui::SameLine();
if( m_findZone.showThreads )
{
if( ImGui::SmallButton( "Group by user text" ) )
{
m_findZone.showThreads = false;
m_findZone.selThread = m_findZone.Unselected;
m_findZone.ResetThreads();
}
}
else
{
if( ImGui::SmallButton( "Group by threads" ) )
{
m_findZone.showThreads = true;
m_findZone.selThread = m_findZone.Unselected;
m_findZone.ResetThreads();
}
}
ImGui::SameLine();
if( m_findZone.sortByCounts ) if( m_findZone.sortByCounts )
{ {
if( ImGui::SmallButton( "Sort by order" ) ) if( ImGui::SmallButton( "Sort by order" ) )
@ -4264,12 +4262,18 @@ void View::DrawFindZone()
ImGui::EndTooltip(); ImGui::EndTooltip();
} }
if( ImGui::Combo( "Group by", (int*)( &m_findZone.groupBy ), "Thread\0User text\0Callstacks\0\0" ) )
{
m_findZone.selThread = m_findZone.Unselected;
m_findZone.ResetThreads();
}
auto& zones = m_worker.GetZonesForSourceLocation( m_findZone.match[m_findZone.selMatch] ).zones; auto& zones = m_worker.GetZonesForSourceLocation( m_findZone.match[m_findZone.selMatch] ).zones;
auto sz = zones.size(); auto sz = zones.size();
auto processed = m_findZone.processed; auto processed = m_findZone.processed;
const auto hmin = std::min( m_findZone.highlight.start, m_findZone.highlight.end ); const auto hmin = std::min( m_findZone.highlight.start, m_findZone.highlight.end );
const auto hmax = std::max( m_findZone.highlight.start, m_findZone.highlight.end ); const auto hmax = std::max( m_findZone.highlight.start, m_findZone.highlight.end );
const auto showThreads = m_findZone.showThreads; const auto groupBy = m_findZone.groupBy;
const auto highlightActive = m_findZone.highlight.active; const auto highlightActive = m_findZone.highlight.active;
while( processed < sz ) while( processed < sz )
{ {
@ -4294,14 +4298,20 @@ void View::DrawFindZone()
} }
processed++; processed++;
if( showThreads ) switch( m_findZone.groupBy )
{ {
case FindZone::GroupBy::Thread:
m_findZone.threads[ev.thread].push_back( ev.zone ); m_findZone.threads[ev.thread].push_back( ev.zone );
} break;
else case FindZone::GroupBy::UserText:
{ m_findZone.threads[ev.zone->text.active ? ev.zone->text.idx : std::numeric_limits<uint64_t>::max()].push_back( ev.zone );
const uint64_t id = ev.zone->text.active ? ev.zone->text.idx : std::numeric_limits<uint64_t>::max(); break;
m_findZone.threads[id].push_back( ev.zone ); case FindZone::GroupBy::Callstack:
m_findZone.threads[ev.zone->callstack].push_back( ev.zone );
break;
default:
assert( false );
break;
} }
} }
m_findZone.processed = processed; m_findZone.processed = processed;
@ -4319,16 +4329,33 @@ void View::DrawFindZone()
} }
ImGui::BeginChild( "##zonesScroll", ImVec2( ImGui::GetWindowContentRegionWidth(), std::max( 200.f, ImGui::GetContentRegionAvail().y ) ) ); ImGui::BeginChild( "##zonesScroll", ImVec2( ImGui::GetWindowContentRegionWidth(), std::max( 200.f, ImGui::GetContentRegionAvail().y ) ) );
idx = 0;
for( auto& v : threads ) for( auto& v : threads )
{ {
const char* hdrString; const char* hdrString;
if( showThreads ) switch( m_findZone.groupBy )
{ {
case FindZone::GroupBy::Thread:
hdrString = m_worker.GetThreadString( m_worker.DecompressThread( v->first ) ); hdrString = m_worker.GetThreadString( m_worker.DecompressThread( v->first ) );
} break;
else case FindZone::GroupBy::UserText:
{
hdrString = v->first == std::numeric_limits<uint64_t>::max() ? "No user text" : m_worker.GetString( StringIdx( v->first ) ); hdrString = v->first == std::numeric_limits<uint64_t>::max() ? "No user text" : m_worker.GetString( StringIdx( v->first ) );
break;
case FindZone::GroupBy::Callstack:
if( v->first == std::numeric_limits<uint64_t>::max() )
{
hdrString = "No callstack";
}
else
{
auto& callstack = m_worker.GetCallstack( v->first );
hdrString = m_worker.GetString( m_worker.GetCallstackFrame( *callstack.begin() )->name );
}
break;
default:
hdrString = nullptr;
assert( false );
break;
} }
ImGui::PushID( v->first ); ImGui::PushID( v->first );
const bool expand = ImGui::TreeNodeEx( hdrString, ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick | ( v->first == m_findZone.selThread ? ImGuiTreeNodeFlags_Selected : 0 ) ); const bool expand = ImGui::TreeNodeEx( hdrString, ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick | ( v->first == m_findZone.selThread ? ImGuiTreeNodeFlags_Selected : 0 ) );
@ -4339,6 +4366,11 @@ void View::DrawFindZone()
ImGui::PopID(); ImGui::PopID();
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextColored( ImVec4( 0.5f, 0.5f, 0.5f, 1.0f ), "(%s)", RealToString( v->second.size(), true ) ); ImGui::TextColored( ImVec4( 0.5f, 0.5f, 0.5f, 1.0f ), "(%s)", RealToString( v->second.size(), true ) );
if( m_findZone.groupBy == FindZone::GroupBy::Callstack )
{
ImGui::SameLine();
SmallCallstackButton( "callstack", v->first, idx );
}
if( expand ) if( expand )
{ {

7
server/TracyView.hpp
View File

@ -217,8 +217,9 @@ private:
Vector<const ZoneEvent*> m_zoneInfoStack; Vector<const ZoneEvent*> m_zoneInfoStack;
Vector<const GpuEvent*> m_gpuInfoStack; Vector<const GpuEvent*> m_gpuInfoStack;
struct { struct FindZone {
enum : uint64_t { Unselected = std::numeric_limits<uint64_t>::max() - 1 }; enum : uint64_t { Unselected = std::numeric_limits<uint64_t>::max() - 1 };
enum class GroupBy : int { Thread, UserText, Callstack };
bool show = false; bool show = false;
std::vector<int32_t> match; std::vector<int32_t> match;
@ -230,7 +231,7 @@ private:
bool logVal = false; bool logVal = false;
bool logTime = true; bool logTime = true;
bool cumulateTime = false; bool cumulateTime = false;
bool showThreads = true; GroupBy groupBy = GroupBy::Thread;
bool sortByCounts = false; bool sortByCounts = false;
Region highlight; Region highlight;
int64_t numBins = -1; int64_t numBins = -1;
@ -260,6 +261,8 @@ private:
} }
} m_findZone; } m_findZone;
tracy_force_inline uint64_t GetSelectionTarget( const Worker::ZoneThreadData& ev, FindZone::GroupBy groupBy ) const;
struct CompVal struct CompVal
{ {
double v0; double v0;

2
server/TracyWorker.hpp
View File

@ -47,6 +47,7 @@ struct UnsupportedVersion : public std::exception
class Worker class Worker
{ {
public:
#pragma pack( 1 ) #pragma pack( 1 )
struct ZoneThreadData struct ZoneThreadData
{ {
@ -55,6 +56,7 @@ class Worker
}; };
#pragma pack() #pragma pack()
private:
struct SourceLocationZones struct SourceLocationZones
{ {
SourceLocationZones() SourceLocationZones()