mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 20:33:52 +00:00
Code Issues Releases Wiki Activity

Split source and symbol views in SourceView.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-04-08 01:58:23 +02:00
parent 1c0ec60b23
commit 09cf160088
2 changed files with 63 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
server/TracySourceView.cpp
View File

@ -271,7 +271,58 @@ void SourceView::Render( const Worker& worker )
{ {
m_highlightAddr.Decay( 0 ); m_highlightAddr.Decay( 0 );
if( m_file ) TextFocused( "File:", m_file ); if( m_symAddr == 0 )
{
if( m_file ) TextFocused( "File:", m_file );
TextColoredUnformatted( ImVec4( 1.f, 1.f, 0.2f, 1.f ), ICON_FA_EXCLAMATION_TRIANGLE );
ImGui::SameLine();
TextColoredUnformatted( ImVec4( 1.f, 0.3f, 0.3f, 1.f ), "The source file contents might not reflect the actual profiled code!" );
ImGui::SameLine();
TextColoredUnformatted( ImVec4( 1.f, 1.f, 0.2f, 1.f ), ICON_FA_EXCLAMATION_TRIANGLE );
RenderSimpleSourceView();
}
else
{
RenderSymbolView( worker );
}
}
void SourceView::RenderSimpleSourceView()
{
ImGui::BeginChild( "##sourceView", ImVec2( 0, 0 ), true );
if( m_font ) ImGui::PushFont( m_font );
if( m_targetLine != 0 )
{
int lineNum = 1;
for( auto& line : m_lines )
{
if( m_targetLine == lineNum )
{
m_targetLine = 0;
ImGui::SetScrollHereY();
}
RenderLine( line, lineNum++, 0, 0, nullptr );
}
}
else
{
ImGuiListClipper clipper( (int)m_lines.size() );
while( clipper.Step() )
{
for( auto i=clipper.DisplayStart; i<clipper.DisplayEnd; i++ )
{
RenderLine( m_lines[i], i+1, 0, 0, nullptr );
}
}
}
if( m_font ) ImGui::PopFont();
ImGui::EndChild();
}
void SourceView::RenderSymbolView( const Worker& worker )
{
assert( m_symAddr != 0 );
if( !m_asm.empty() && !m_lines.empty() ) if( !m_asm.empty() && !m_lines.empty() )
{ {
@ -300,7 +351,7 @@ void SourceView::Render( const Worker& worker )
uint32_t iptotal = 0; uint32_t iptotal = 0;
unordered_flat_map<uint64_t, uint32_t> ipcount; unordered_flat_map<uint64_t, uint32_t> ipcount;
auto ipmap = m_symAddr != 0 ? worker.GetSymbolInstructionPointers( m_symAddr ) : nullptr; auto ipmap = worker.GetSymbolInstructionPointers( m_symAddr );
if( ipmap ) if( ipmap )
{ {
if( m_showAsm ) if( m_showAsm )
@ -492,7 +543,7 @@ void SourceView::Render( const Worker& worker )
m_targetLine = 0; m_targetLine = 0;
ImGui::SetScrollHereY(); ImGui::SetScrollHereY();
} }
RenderLine( line, lineNum++, 0, iptotal, worker ); RenderLine( line, lineNum++, 0, iptotal, &worker );
} }
} }
else else
@ -504,7 +555,7 @@ void SourceView::Render( const Worker& worker )
{ {
for( auto i=clipper.DisplayStart; i<clipper.DisplayEnd; i++ ) for( auto i=clipper.DisplayStart; i<clipper.DisplayEnd; i++ )
{ {
RenderLine( m_lines[i], i+1, 0, 0, worker ); RenderLine( m_lines[i], i+1, 0, 0, &worker );
} }
} }
else else
@ -513,7 +564,7 @@ void SourceView::Render( const Worker& worker )
{ {
auto it = ipcount.find( i+1 ); auto it = ipcount.find( i+1 );
const auto ipcnt = it == ipcount.end() ? 0 : it->second; const auto ipcnt = it == ipcount.end() ? 0 : it->second;
RenderLine( m_lines[i], i+1, ipcnt, iptotal, worker ); RenderLine( m_lines[i], i+1, ipcnt, iptotal, &worker );
} }
} }
} }
@ -566,7 +617,7 @@ static void PrintPercentage( float val )
ImGui::ItemSize( ImVec2( stw * 7, ty ), 0 ); ImGui::ItemSize( ImVec2( stw * 7, ty ), 0 );
} }
void SourceView::RenderLine( const Line& line, int lineNum, uint32_t ipcnt, uint32_t iptotal, const Worker& worker ) void SourceView::RenderLine( const Line& line, int lineNum, uint32_t ipcnt, uint32_t iptotal, const Worker* worker )
{ {
const auto ty = ImGui::GetFontSize(); const auto ty = ImGui::GetFontSize();
auto draw = ImGui::GetWindowDrawList(); auto draw = ImGui::GetWindowDrawList();
@ -601,9 +652,10 @@ void SourceView::RenderLine( const Line& line, int lineNum, uint32_t ipcnt, uint
if( m_symAddr != 0 ) if( m_symAddr != 0 )
{ {
assert( worker );
const auto stw = ImGui::CalcTextSize( " " ).x; const auto stw = ImGui::CalcTextSize( " " ).x;
uint32_t match = 0; uint32_t match = 0;
auto addresses = worker.GetAddressesForLocation( m_fileStringIdx, lineNum ); auto addresses = worker->GetAddressesForLocation( m_fileStringIdx, lineNum );
if( addresses ) if( addresses )
{ {
for( auto& addr : *addresses ) for( auto& addr : *addresses )

5
server/TracySourceView.hpp
View File

@ -46,7 +46,10 @@ public:
void Render( const Worker& worker ); void Render( const Worker& worker );
private: private:
void RenderLine( const Line& line, int lineNum, uint32_t ipcnt, uint32_t iptotal, const Worker& worker ); void RenderSimpleSourceView();
void RenderSymbolView( const Worker& worker );
void RenderLine( const Line& line, int lineNum, uint32_t ipcnt, uint32_t iptotal, const Worker* worker );
void RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t iptotal, const Worker& worker, uint64_t& jumpOut ); void RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t iptotal, const Worker& worker, uint64_t& jumpOut );
bool Disassemble( uint64_t symAddr, const Worker& worker ); bool Disassemble( uint64_t symAddr, const Worker& worker );