mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-30 12:53:51 +00:00
Code Issues Releases Wiki Activity

Save per-trace options.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-08-28 21:35:08 +02:00
parent fc5293b1ae
commit 6f25ad5fcb
4 changed files with 127 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
server/TracyUserData.cpp
View File

@ -10,8 +10,10 @@ namespace tracy
constexpr auto FileDescription = "description"; constexpr auto FileDescription = "description";
constexpr auto FileTimeline = "timeline"; constexpr auto FileTimeline = "timeline";
constexpr auto FileOptions = "options";
enum : uint32_t { VersionTimeline = 0 }; enum : uint32_t { VersionTimeline = 0 };
enum : uint32_t { VersionOptions = 0 };
UserData::UserData() UserData::UserData()
: m_preserveState( false ) : m_preserveState( false )
@ -61,7 +63,8 @@ void UserData::LoadState( ViewData& data )
{ {
assert( Valid() ); assert( Valid() );
FILE* f = OpenFile( FileTimeline, false ); FILE* f = OpenFile( FileTimeline, false );
if( !f ) return; if( f )
{
uint32_t ver; uint32_t ver;
fread( &ver, 1, sizeof( ver ), f ); fread( &ver, 1, sizeof( ver ), f );
if( ver == VersionTimeline ) if( ver == VersionTimeline )
@ -74,6 +77,26 @@ void UserData::LoadState( ViewData& data )
fread( &data.frameStart, 1, sizeof( data.frameStart ), f ); fread( &data.frameStart, 1, sizeof( data.frameStart ), f );
} }
fclose( f ); fclose( f );
}
f = OpenFile( FileOptions, false );
if( f )
{
uint32_t ver;
fread( &ver, 1, sizeof( ver ), f );
if( ver == VersionOptions )
{
fread( &data.drawGpuZones, 1, sizeof( data.drawGpuZones ), f );
fread( &data.drawZones, 1, sizeof( data.drawZones ), f );
fread( &data.drawLocks, 1, sizeof( data.drawLocks ), f );
fread( &data.drawPlots, 1, sizeof( data.drawPlots ), f );
fread( &data.onlyContendedLocks, 1, sizeof( data.onlyContendedLocks ), f );
fread( &data.drawEmptyLabels, 1, sizeof( data.drawEmptyLabels ), f );
fread( &data.drawContextSwitches, 1, sizeof( data.drawContextSwitches ), f );
fread( &data.drawCpuData, 1, sizeof( data.drawCpuData ), f );
}
fclose( f );
}
} }
void UserData::SaveState( const ViewData& data ) void UserData::SaveState( const ViewData& data )
@ -81,7 +104,8 @@ void UserData::SaveState( const ViewData& data )
if( !m_preserveState ) return; if( !m_preserveState ) return;
assert( Valid() ); assert( Valid() );
FILE* f = OpenFile( FileTimeline, true ); FILE* f = OpenFile( FileTimeline, true );
if( !f ) return; if( f )
{
uint32_t ver = VersionTimeline; uint32_t ver = VersionTimeline;
fwrite( &ver, 1, sizeof( ver ), f ); fwrite( &ver, 1, sizeof( ver ), f );
fwrite( &data.zvStart, 1, sizeof( data.zvStart ), f ); fwrite( &data.zvStart, 1, sizeof( data.zvStart ), f );
@ -91,6 +115,23 @@ void UserData::SaveState( const ViewData& data )
fwrite( &data.frameScale, 1, sizeof( data.frameScale ), f ); fwrite( &data.frameScale, 1, sizeof( data.frameScale ), f );
fwrite( &data.frameStart, 1, sizeof( data.frameStart ), f ); fwrite( &data.frameStart, 1, sizeof( data.frameStart ), f );
fclose( f ); fclose( f );
}
f = OpenFile( FileOptions, true );
if( f )
{
uint32_t ver = VersionOptions;
fwrite( &ver, 1, sizeof( ver ), f );
fwrite( &data.drawGpuZones, 1, sizeof( data.drawGpuZones ), f );
fwrite( &data.drawZones, 1, sizeof( data.drawZones ), f );
fwrite( &data.drawLocks, 1, sizeof( data.drawLocks ), f );
fwrite( &data.drawPlots, 1, sizeof( data.drawPlots ), f );
fwrite( &data.onlyContendedLocks, 1, sizeof( data.onlyContendedLocks ), f );
fwrite( &data.drawEmptyLabels, 1, sizeof( data.drawEmptyLabels ), f );
fwrite( &data.drawContextSwitches, 1, sizeof( data.drawContextSwitches ), f );
fwrite( &data.drawCpuData, 1, sizeof( data.drawCpuData ), f );
fclose( f );
}
} }
void UserData::StateShouldBePreserved() void UserData::StateShouldBePreserved()

96
server/TracyView.cpp
View File

@ -716,7 +716,7 @@ void View::DrawNotificationArea()
} }
} }
} }
if( !m_drawContextSwitches ) if( !m_vd.drawContextSwitches )
{ {
ImGui::SameLine(); ImGui::SameLine();
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
@ -729,10 +729,10 @@ void View::DrawNotificationArea()
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::TextUnformatted( "Context switches are hidden." ); ImGui::TextUnformatted( "Context switches are hidden." );
ImGui::EndTooltip(); ImGui::EndTooltip();
if( ImGui::IsMouseClicked( 0 ) ) m_drawContextSwitches = true; if( ImGui::IsMouseClicked( 0 ) ) m_vd.drawContextSwitches = true;
} }
} }
if( !m_drawCpuData ) if( !m_vd.drawCpuData )
{ {
ImGui::SameLine(); ImGui::SameLine();
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
@ -745,10 +745,10 @@ void View::DrawNotificationArea()
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::TextUnformatted( "CPU data is hidden." ); ImGui::TextUnformatted( "CPU data is hidden." );
ImGui::EndTooltip(); ImGui::EndTooltip();
if( ImGui::IsMouseClicked( 0 ) ) m_drawCpuData = true; if( ImGui::IsMouseClicked( 0 ) ) m_vd.drawCpuData = true;
} }
} }
if( !m_drawGpuZones ) if( !m_vd.drawGpuZones )
{ {
ImGui::SameLine(); ImGui::SameLine();
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
@ -761,10 +761,10 @@ void View::DrawNotificationArea()
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::TextUnformatted( "GPU zones are hidden." ); ImGui::TextUnformatted( "GPU zones are hidden." );
ImGui::EndTooltip(); ImGui::EndTooltip();
if( ImGui::IsMouseClicked( 0 ) ) m_drawGpuZones = true; if( ImGui::IsMouseClicked( 0 ) ) m_vd.drawGpuZones = true;
} }
} }
if( !m_drawZones ) if( !m_vd.drawZones )
{ {
ImGui::SameLine(); ImGui::SameLine();
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
@ -777,10 +777,10 @@ void View::DrawNotificationArea()
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::TextUnformatted( "CPU zones are hidden." ); ImGui::TextUnformatted( "CPU zones are hidden." );
ImGui::EndTooltip(); ImGui::EndTooltip();
if( ImGui::IsMouseClicked( 0 ) ) m_drawZones = true; if( ImGui::IsMouseClicked( 0 ) ) m_vd.drawZones = true;
} }
} }
if( !m_drawLocks ) if( !m_vd.drawLocks )
{ {
ImGui::SameLine(); ImGui::SameLine();
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
@ -793,10 +793,10 @@ void View::DrawNotificationArea()
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::TextUnformatted( "Locks are hidden." ); ImGui::TextUnformatted( "Locks are hidden." );
ImGui::EndTooltip(); ImGui::EndTooltip();
if( ImGui::IsMouseClicked( 0 ) ) m_drawLocks = true; if( ImGui::IsMouseClicked( 0 ) ) m_vd.drawLocks = true;
} }
} }
if( !m_drawPlots ) if( !m_vd.drawPlots )
{ {
ImGui::SameLine(); ImGui::SameLine();
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
@ -809,7 +809,7 @@ void View::DrawNotificationArea()
ImGui::BeginTooltip(); ImGui::BeginTooltip();
ImGui::TextUnformatted( "Plots are hidden." ); ImGui::TextUnformatted( "Plots are hidden." );
ImGui::EndTooltip(); ImGui::EndTooltip();
if( ImGui::IsMouseClicked( 0 ) ) m_drawPlots = true; if( ImGui::IsMouseClicked( 0 ) ) m_vd.drawPlots = true;
} }
} }
{ {
@ -1894,7 +1894,7 @@ void View::DrawZones()
const auto th = ( ty - to ) * sqrt( 3 ) * 0.5; const auto th = ( ty - to ) * sqrt( 3 ) * 0.5;
// gpu zones // gpu zones
if( m_drawGpuZones ) if( m_vd.drawGpuZones )
{ {
for( size_t i=0; i<m_worker.GetGpuData().size(); i++ ) for( size_t i=0; i<m_worker.GetGpuData().size(); i++ )
{ {
@ -1923,7 +1923,7 @@ void View::DrawZones()
} }
offset += ostep * 0.2f; offset += ostep * 0.2f;
if( !m_drawEmptyLabels && showFull && depth == 0 ) if( !m_vd.drawEmptyLabels && showFull && depth == 0 )
{ {
vis.height = 0; vis.height = 0;
vis.offset = 0; vis.offset = 0;
@ -2007,7 +2007,7 @@ void View::DrawZones()
} }
// zones // zones
if( m_drawCpuData && m_worker.HasContextSwitches() ) if( m_vd.drawCpuData && m_worker.HasContextSwitches() )
{ {
offset = DrawCpuData( offset, pxns, wpos, hover, yMin, yMax ); offset = DrawCpuData( offset, pxns, wpos, hover, yMin, yMax );
} }
@ -2043,7 +2043,7 @@ void View::DrawZones()
offset += ostep; offset += ostep;
if( showFull ) if( showFull )
{ {
if( m_drawContextSwitches ) if( m_vd.drawContextSwitches )
{ {
auto ctxSwitch = m_worker.GetContextSwitchData( v->id ); auto ctxSwitch = m_worker.GetContextSwitchData( v->id );
if( ctxSwitch ) if( ctxSwitch )
@ -2053,13 +2053,13 @@ void View::DrawZones()
} }
} }
if( m_drawZones ) if( m_vd.drawZones )
{ {
depth = DispatchZoneLevel( v->timeline, hover, pxns, int64_t( nspx ), wpos, offset, 0, yMin, yMax ); depth = DispatchZoneLevel( v->timeline, hover, pxns, int64_t( nspx ), wpos, offset, 0, yMin, yMax );
offset += ostep * depth; offset += ostep * depth;
} }
if( m_drawLocks ) if( m_vd.drawLocks )
{ {
const auto lockDepth = DrawLocks( v->id, hover, pxns, wpos, offset, nextLockHighlight, yMin, yMax ); const auto lockDepth = DrawLocks( v->id, hover, pxns, wpos, offset, nextLockHighlight, yMin, yMax );
offset += ostep * lockDepth; offset += ostep * lockDepth;
@ -2071,7 +2071,7 @@ void View::DrawZones()
auto msgit = std::lower_bound( v->messages.begin(), v->messages.end(), m_vd.zvStart, [] ( const auto& lhs, const auto& rhs ) { return lhs->time < rhs; } ); auto msgit = std::lower_bound( v->messages.begin(), v->messages.end(), m_vd.zvStart, [] ( const auto& lhs, const auto& rhs ) { return lhs->time < rhs; } );
auto msgend = std::lower_bound( msgit, v->messages.end(), m_vd.zvEnd+1, [] ( const auto& lhs, const auto& rhs ) { return lhs->time < rhs; } ); auto msgend = std::lower_bound( msgit, v->messages.end(), m_vd.zvEnd+1, [] ( const auto& lhs, const auto& rhs ) { return lhs->time < rhs; } );
if( !m_drawEmptyLabels && showFull && depth == 0 && msgit == msgend && crash.thread != v->id ) if( !m_vd.drawEmptyLabels && showFull && depth == 0 && msgit == msgend && crash.thread != v->id )
{ {
auto& vis = Vis( v ); auto& vis = Vis( v );
vis.height = 0; vis.height = 0;
@ -2314,7 +2314,7 @@ void View::DrawZones()
} }
m_lockHighlight = nextLockHighlight; m_lockHighlight = nextLockHighlight;
if( m_drawPlots ) if( m_vd.drawPlots )
{ {
offset = DrawPlots( offset, pxns, wpos, hover, yMin, yMax ); offset = DrawPlots( offset, pxns, wpos, hover, yMin, yMax );
} }
@ -3516,7 +3516,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
{ {
const auto& lockmap = *v.second; const auto& lockmap = *v.second;
if( !lockmap.valid || !Vis( &lockmap ).visible ) continue; if( !lockmap.valid || !Vis( &lockmap ).visible ) continue;
if( m_onlyContendedLocks && ( lockmap.threadList.size() == 1 || !lockmap.isContended ) && m_lockInfoWindow != v.first ) continue; if( m_vd.onlyContendedLocks && ( lockmap.threadList.size() == 1 || !lockmap.isContended ) && m_lockInfoWindow != v.first ) continue;
auto it = lockmap.threadMap.find( tid ); auto it = lockmap.threadMap.find( tid );
if( it == lockmap.threadMap.end() ) continue; if( it == lockmap.threadMap.end() ) continue;
@ -3597,7 +3597,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
double pxend = 0; double pxend = 0;
for(;;) for(;;)
{ {
if( m_onlyContendedLocks ) if( m_vd.onlyContendedLocks )
{ {
while( vbegin < vend && ( state == LockState::Nothing || state == LockState::HasLock ) ) while( vbegin < vend && ( state == LockState::Nothing || state == LockState::HasLock ) )
{ {
@ -3613,7 +3613,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
} }
if( vbegin >= vend ) break; if( vbegin >= vend ) break;
assert( state != LockState::Nothing && ( !m_onlyContendedLocks || state != LockState::HasLock ) ); assert( state != LockState::Nothing && ( !m_vd.onlyContendedLocks || state != LockState::HasLock ) );
drawn = true; drawn = true;
LockState drawState = state; LockState drawState = state;
@ -3626,7 +3626,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
double px1 = ( t1 - m_vd.zvStart ) * pxns; double px1 = ( t1 - m_vd.zvStart ) * pxns;
uint64_t condensed = 0; uint64_t condensed = 0;
if( m_onlyContendedLocks ) if( m_vd.onlyContendedLocks )
{ {
for(;;) for(;;)
{ {
@ -4025,7 +4025,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
} }
else else
{ {
while( vbegin < vend && ( state == LockState::Nothing || ( m_onlyContendedLocks && state == LockState::HasLock ) ) ) while( vbegin < vend && ( state == LockState::Nothing || ( m_vd.onlyContendedLocks && state == LockState::HasLock ) ) )
{ {
vbegin = GetNextLockFunc( vbegin, vend, state, threadBit ); vbegin = GetNextLockFunc( vbegin, vend, state, threadBit );
} }
@ -6144,31 +6144,39 @@ void View::DrawOptions()
{ {
ImGui::Begin( "Options", &m_showOptions, ImGuiWindowFlags_AlwaysAutoResize ); ImGui::Begin( "Options", &m_showOptions, ImGuiWindowFlags_AlwaysAutoResize );
bool val = m_vd.drawEmptyLabels;
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
ImGui::Checkbox( ICON_FA_EXPAND " Draw empty labels", &m_drawEmptyLabels ); ImGui::Checkbox( ICON_FA_EXPAND " Draw empty labels", &val );
#else #else
ImGui::Checkbox( "Draw empty labels", &m_drawEmptyLabels ); ImGui::Checkbox( "Draw empty labels", &val );
#endif #endif
m_vd.drawEmptyLabels = val;
val = m_vd.drawContextSwitches;
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
ImGui::Checkbox( ICON_FA_HIKING " Draw context switches", &m_drawContextSwitches ); ImGui::Checkbox( ICON_FA_HIKING " Draw context switches", &val );
#else #else
ImGui::Checkbox( "Draw context switches", &m_drawContextSwitches ); ImGui::Checkbox( "Draw context switches", &val );
#endif #endif
m_vd.drawContextSwitches = val;
val = m_vd.drawCpuData;
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
ImGui::Checkbox( ICON_FA_SLIDERS_H " Draw CPU data", &m_drawCpuData ); ImGui::Checkbox( ICON_FA_SLIDERS_H " Draw CPU data", &val );
#else #else
ImGui::Checkbox( "Draw CPU data", &m_drawCpuData ); ImGui::Checkbox( "Draw CPU data", &val );
#endif #endif
m_vd.drawCpuData = val;
ImGui::Separator(); ImGui::Separator();
const auto& gpuData = m_worker.GetGpuData(); const auto& gpuData = m_worker.GetGpuData();
if( !gpuData.empty() ) if( !gpuData.empty() )
{ {
val = m_vd.drawGpuZones;
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
ImGui::Checkbox( ICON_FA_EYE " Draw GPU zones", &m_drawGpuZones ); ImGui::Checkbox( ICON_FA_EYE " Draw GPU zones", &val );
#else #else
ImGui::Checkbox( "Draw GPU zones", &m_drawGpuZones ); ImGui::Checkbox( "Draw GPU zones", &val );
#endif #endif
m_vd.drawGpuZones = val;
const auto expand = ImGui::TreeNode( "GPU zones" ); const auto expand = ImGui::TreeNode( "GPU zones" );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(%zu)", gpuData.size() ); ImGui::TextDisabled( "(%zu)", gpuData.size() );
@ -6241,11 +6249,13 @@ void View::DrawOptions()
} }
} }
val = m_vd.drawZones;
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
ImGui::Checkbox( ICON_FA_MICROCHIP " Draw CPU zones", &m_drawZones ); ImGui::Checkbox( ICON_FA_MICROCHIP " Draw CPU zones", &val );
#else #else
ImGui::Checkbox( "Draw CPU zones", &m_drawZones ); ImGui::Checkbox( "Draw CPU zones", &val );
#endif #endif
m_vd.drawZones = val;
int ns = (int)m_namespace; int ns = (int)m_namespace;
ImGui::Combo( "Namespaces", &ns, "Full\0Shortened\0None\0" ); ImGui::Combo( "Namespaces", &ns, "Full\0Shortened\0None\0" );
m_namespace = (Namespace)ns; m_namespace = (Namespace)ns;
@ -6277,13 +6287,17 @@ void View::DrawOptions()
} }
ImGui::Separator(); ImGui::Separator();
val = m_vd.drawLocks;
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
ImGui::Checkbox( ICON_FA_LOCK " Draw locks", &m_drawLocks ); ImGui::Checkbox( ICON_FA_LOCK " Draw locks", &val );
#else #else
ImGui::Checkbox( "Draw locks", &m_drawLocks ); ImGui::Checkbox( "Draw locks", &val );
#endif #endif
m_vd.drawLocks = val;
ImGui::SameLine(); ImGui::SameLine();
ImGui::Checkbox( "Only contended", &m_onlyContendedLocks ); val = m_vd.onlyContendedLocks;
ImGui::Checkbox( "Only contended", &val );
m_vd.onlyContendedLocks = val;
const auto expand = ImGui::TreeNode( "Locks" ); const auto expand = ImGui::TreeNode( "Locks" );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(%zu)", lockCnt ); ImGui::TextDisabled( "(%zu)", lockCnt );
@ -6522,11 +6536,13 @@ void View::DrawOptions()
if( !m_worker.GetPlots().empty() ) if( !m_worker.GetPlots().empty() )
{ {
ImGui::Separator(); ImGui::Separator();
val = m_vd.drawPlots;
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
ImGui::Checkbox( ICON_FA_SIGNATURE " Draw plots", &m_drawPlots ); ImGui::Checkbox( ICON_FA_SIGNATURE " Draw plots", &val );
#else #else
ImGui::Checkbox( "Draw plots", &m_drawPlots ); ImGui::Checkbox( "Draw plots", &val );
#endif #endif
m_vd.drawPlots = val;
const auto expand = ImGui::TreeNode( "Plots" ); const auto expand = ImGui::TreeNode( "Plots" );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextDisabled( "(%zu)", m_worker.GetPlots().size() ); ImGui::TextDisabled( "(%zu)", m_worker.GetPlots().size() );

8
server/TracyView.hpp
View File

@ -284,15 +284,7 @@ private:
bool m_showInfo = false; bool m_showInfo = false;
bool m_showPlayback = false; bool m_showPlayback = false;
bool m_showCpuDataWindow = false; bool m_showCpuDataWindow = false;
bool m_drawGpuZones = true;
bool m_drawZones = true;
bool m_drawLocks = true;
bool m_drawPlots = true;
bool m_onlyContendedLocks = true;
bool m_goToFrame = false; bool m_goToFrame = false;
bool m_drawEmptyLabels = false;
bool m_drawContextSwitches = true;
bool m_drawCpuData = true;
enum class CpuDataSortBy enum class CpuDataSortBy
{ {

9
server/TracyViewData.hpp
View File

@ -14,6 +14,15 @@ struct ViewData
int32_t zvScroll = 0; int32_t zvScroll = 0;
int32_t frameScale = 0; int32_t frameScale = 0;
int32_t frameStart = 0; int32_t frameStart = 0;
uint8_t drawGpuZones = true;
uint8_t drawZones = true;
uint8_t drawLocks = true;
uint8_t drawPlots = true;
uint8_t onlyContendedLocks = true;
uint8_t drawEmptyLabels = false;
uint8_t drawContextSwitches = true;
uint8_t drawCpuData = true;
}; };
} }