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

Wrap access to source location function and file.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-11-05 21:03:08 +01:00
parent 3d2450fc10
commit 8178b61973
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
server/TracyView.cpp
View File

@ -2130,7 +2130,7 @@ int View::DrawZoneLevel( const Vector<ZoneEvent*>& vec, bool hover, double pxns,
} }
else else
{ {
zoneName = GetString( srcloc.function ); zoneName = GetSrcLocFunction( srcloc );
} }
int dmul = 1; int dmul = 1;
@ -2511,8 +2511,8 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::Text( "Lock #%" PRIu32, v.first ); ImGui::Text( "Lock #%" PRIu32, v.first );
ImGui::Text( "%s", GetString( srcloc.function ) ); ImGui::Text( "%s", GetSrcLocFunction( srcloc ) );
ImGui::Text( "%s:%i", GetString( srcloc.file ), srcloc.line ); ImGui::Text( "%s:%i", GetSrcLocFile( srcloc ), srcloc.line );
ImGui::Text( "Time: %s", TimeToString( t1 - t0 ) ); ImGui::Text( "Time: %s", TimeToString( t1 - t0 ) );
ImGui::Separator(); ImGui::Separator();
@ -2535,8 +2535,8 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
{ {
auto& marklocdata = GetSourceLocation( markloc ); auto& marklocdata = GetSourceLocation( markloc );
ImGui::Text( "Lock event location:" ); ImGui::Text( "Lock event location:" );
ImGui::Text( "%s", GetString( marklocdata.function ) ); ImGui::Text( "%s", GetSrcLocFunction( marklocdata ) );
ImGui::Text( "%s:%i", GetString( marklocdata.file ), marklocdata.line ); ImGui::Text( "%s:%i", GetSrcLocFile( marklocdata ), marklocdata.line );
ImGui::Separator(); ImGui::Separator();
} }
@ -2628,7 +2628,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
if( drawn ) if( drawn )
{ {
char buf[1024]; char buf[1024];
sprintf( buf, "%" PRIu32 ": %s", v.first, GetString( srcloc.function ) ); sprintf( buf, "%" PRIu32 ": %s", v.first, GetSrcLocFunction( srcloc ) );
draw->AddText( wpos + ImVec2( 0, offset ), 0xFF8888FF, buf ); draw->AddText( wpos + ImVec2( 0, offset ), 0xFF8888FF, buf );
if( hover && ImGui::IsMouseHoveringRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( ty + ImGui::CalcTextSize( buf ).x, offset + ty ) ) ) if( hover && ImGui::IsMouseHoveringRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( ty + ImGui::CalcTextSize( buf ).x, offset + ty ) ) )
{ {
@ -2894,8 +2894,8 @@ void View::DrawZoneInfoWindow()
dmul++; dmul++;
} }
auto& srcloc = GetSourceLocation( ev.srcloc ); auto& srcloc = GetSourceLocation( ev.srcloc );
ImGui::Text( "Function: %s", GetString( srcloc.function ) ); ImGui::Text( "Function: %s", GetSrcLocFunction( srcloc ) );
ImGui::Text( "Location: %s:%i", GetString( srcloc.file ), srcloc.line ); ImGui::Text( "Location: %s:%i", GetSrcLocFile( srcloc ), srcloc.line );
if( ev.text != -1 && GetTextData( ev )->userText ) if( ev.text != -1 && GetTextData( ev )->userText )
{ {
ImGui::Text( "User text: %s", GetTextData( ev )->userText ); ImGui::Text( "User text: %s", GetTextData( ev )->userText );
@ -2944,7 +2944,7 @@ void View::DrawZoneInfoWindow()
else else
{ {
auto& srcloc = GetSourceLocation( cev.srcloc ); auto& srcloc = GetSourceLocation( cev.srcloc );
ImGui::Text( "%s", GetString( srcloc.function ) ); ImGui::Text( "%s", GetSrcLocFunction( srcloc ) );
} }
if( ImGui::IsItemHovered() ) if( ImGui::IsItemHovered() )
{ {
@ -2990,7 +2990,7 @@ void View::DrawOptions()
for( auto& l : m_lockMap ) for( auto& l : m_lockMap )
{ {
char buf[1024]; char buf[1024];
sprintf( buf, "%" PRIu32 ": %s", l.first, GetString( GetSourceLocation( l.second.srcloc ).function ) ); sprintf( buf, "%" PRIu32 ": %s", l.first, GetSrcLocFunction( GetSourceLocation( l.second.srcloc ) ) );
ImGui::Checkbox( buf , &l.second.visible ); ImGui::Checkbox( buf , &l.second.visible );
} }
ImGui::Unindent( tw ); ImGui::Unindent( tw );
@ -3039,6 +3039,16 @@ void View::DrawMessages()
ImGui::End(); ImGui::End();
} }
const char* View::GetSrcLocFunction( const SourceLocation& srcloc )
{
return GetString( srcloc.function );
}
const char* View::GetSrcLocFile( const SourceLocation& srcloc )
{
return GetString( srcloc.file );
}
uint32_t View::GetZoneColor( const ZoneEvent& ev ) uint32_t View::GetZoneColor( const ZoneEvent& ev )
{ {
return GetZoneColor( GetSourceLocation( ev.srcloc ) ); return GetZoneColor( GetSourceLocation( ev.srcloc ) );
@ -3106,7 +3116,7 @@ void View::ZoneTooltip( const ZoneEvent& ev )
auto& srcloc = GetSourceLocation( ev.srcloc ); auto& srcloc = GetSourceLocation( ev.srcloc );
const auto filename = GetString( srcloc.file ); const auto filename = GetSrcLocFile( srcloc );
const auto line = srcloc.line; const auto line = srcloc.line;
const char* func; const char* func;
@ -3114,11 +3124,11 @@ void View::ZoneTooltip( const ZoneEvent& ev )
if( ev.text != -1 && GetTextData( ev )->zoneName ) if( ev.text != -1 && GetTextData( ev )->zoneName )
{ {
zoneName = GetString( GetTextData( ev )->zoneName ); zoneName = GetString( GetTextData( ev )->zoneName );
func = GetString( srcloc.function ); func = GetSrcLocFunction( srcloc );
} }
else else
{ {
func = zoneName = GetString( srcloc.function ); func = zoneName = GetSrcLocFunction( srcloc );
} }
const auto end = GetZoneEnd( ev ); const auto end = GetZoneEnd( ev );

3
server/TracyView.hpp
View File

@ -195,6 +195,9 @@ private:
void HandleZoneViewMouse( int64_t timespan, const ImVec2& wpos, float w, double& pxns ); void HandleZoneViewMouse( int64_t timespan, const ImVec2& wpos, float w, double& pxns );
const char* GetSrcLocFunction( const SourceLocation& srcloc );
const char* GetSrcLocFile( const SourceLocation& srcloc );
uint32_t GetZoneColor( const ZoneEvent& ev ); uint32_t GetZoneColor( const ZoneEvent& ev );
uint32_t GetZoneColor( const SourceLocation& srcloc ); uint32_t GetZoneColor( const SourceLocation& srcloc );
uint32_t GetZoneHighlight( const ZoneEvent& ev, bool migration ); uint32_t GetZoneHighlight( const ZoneEvent& ev, bool migration );