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

Store TextData pointer as an index in array.

Browse Source 
This further reduces ZoneEvent size by 4 bytes.
This commit is contained in:
Bartosz Taudul 2017-10-22 16:40:15 +02:00
parent 2e6350877d
commit cc8683a399
4 changed files with 64 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/TracyEvent.hpp
View File

@ -24,7 +24,7 @@ struct ZoneEvent
int8_t cpu_start; int8_t cpu_start;
int8_t cpu_end; int8_t cpu_end;
TextData* text; int32_t text;
Vector<ZoneEvent*> child; Vector<ZoneEvent*> child;
}; };

111
server/TracyView.cpp
View File

@ -238,6 +238,18 @@ View::View( FileRead& f )
msgMap.emplace( ptr, msgdata ); msgMap.emplace( ptr, msgdata );
} }
f.Read( &sz, sizeof( sz ) );
m_textData.reserve( sz );
for( uint64_t i=0; i<sz; i++ )
{
auto td = m_slab.Alloc<TextData>();
uint64_t ptr;
f.Read( &ptr, sizeof( ptr ) );
td->userText = ptr == 0 ? nullptr : stringMap.find( ptr )->second;
f.Read( &td->zoneName, sizeof( td->zoneName ) );
m_textData.push_back( td );
}
f.Read( &sz, sizeof( sz ) ); f.Read( &sz, sizeof( sz ) );
m_threads.reserve( sz ); m_threads.reserve( sz );
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )
@ -573,7 +585,7 @@ void View::ProcessZoneBegin( const QueueZoneBegin& ev )
zone->srcloc = ev.srcloc; zone->srcloc = ev.srcloc;
assert( ev.cpu == 0xFFFFFFFF || ev.cpu <= std::numeric_limits<int8_t>::max() ); assert( ev.cpu == 0xFFFFFFFF || ev.cpu <= std::numeric_limits<int8_t>::max() );
zone->cpu_start = ev.cpu == 0xFFFFFFFF ? -1 : (int8_t)ev.cpu; zone->cpu_start = ev.cpu == 0xFFFFFFFF ? -1 : (int8_t)ev.cpu;
zone->text = nullptr; zone->text = -1;
std::unique_lock<std::mutex> lock( m_lock ); std::unique_lock<std::mutex> lock( m_lock );
NewZone( zone, ev.thread ); NewZone( zone, ev.thread );
@ -2008,9 +2020,9 @@ int View::DrawZoneLevel( const Vector<ZoneEvent*>& vec, bool hover, double pxns,
else else
{ {
const char* zoneName; const char* zoneName;
if( ev.text && ev.text->zoneName ) if( ev.text != -1 && GetTextData( ev )->zoneName )
{ {
zoneName = GetString( ev.text->zoneName ); zoneName = GetString( GetTextData( ev )->zoneName );
} }
else else
{ {
@ -2018,10 +2030,11 @@ int View::DrawZoneLevel( const Vector<ZoneEvent*>& vec, bool hover, double pxns,
} }
int dmul = 1; int dmul = 1;
if( ev.text ) if( ev.text != -1 )
{ {
if( ev.text->zoneName ) dmul++; auto td = GetTextData( ev );
if( ev.text->userText ) dmul++; if( td->zoneName ) dmul++;
if( td->userText ) dmul++;
} }
bool migration = false; bool migration = false;
@ -2678,17 +2691,17 @@ void View::DrawZoneInfoWindow()
ImGui::Separator(); ImGui::Separator();
if( ev.text && ev.text->zoneName ) if( ev.text != -1 && GetTextData( ev )->zoneName )
{ {
ImGui::Text( "Zone name: %s", GetString( ev.text->zoneName ) ); ImGui::Text( "Zone name: %s", GetString( GetTextData( ev )->zoneName ) );
dmul++; dmul++;
} }
auto& srcloc = GetSourceLocation( ev.srcloc ); auto& srcloc = GetSourceLocation( ev.srcloc );
ImGui::Text( "Function: %s", GetString( srcloc.function ) ); ImGui::Text( "Function: %s", GetString( srcloc.function ) );
ImGui::Text( "Location: %s:%i", GetString( srcloc.file ), srcloc.line ); ImGui::Text( "Location: %s:%i", GetString( srcloc.file ), srcloc.line );
if( ev.text && ev.text->userText ) if( ev.text != -1 && GetTextData( ev )->userText )
{ {
ImGui::Text( "User text: %s", ev.text->userText ); ImGui::Text( "User text: %s", GetTextData( ev )->userText );
dmul++; dmul++;
} }
@ -2727,9 +2740,9 @@ void View::DrawZoneInfoWindow()
for( int i=0; i<ev.child.size(); i++ ) for( int i=0; i<ev.child.size(); i++ )
{ {
auto& cev = *ev.child[cti[i]]; auto& cev = *ev.child[cti[i]];
if( cev.text && cev.text->zoneName ) if( cev.text != -1 && GetTextData( cev )->zoneName )
{ {
ImGui::Text( "%s", GetString( cev.text->zoneName ) ); ImGui::Text( "%s", GetString( GetTextData( cev )->zoneName ) );
} }
else else
{ {
@ -2885,10 +2898,11 @@ void View::ZoomToZone( const ZoneEvent& ev )
void View::ZoneTooltip( const ZoneEvent& ev ) void View::ZoneTooltip( const ZoneEvent& ev )
{ {
int dmul = 1; int dmul = 1;
if( ev.text ) if( ev.text != -1 )
{ {
if( ev.text->zoneName ) dmul++; auto td = GetTextData( ev );
if( ev.text->userText ) dmul++; if( td->zoneName ) dmul++;
if( td->userText ) dmul++;
} }
auto& srcloc = GetSourceLocation( ev.srcloc ); auto& srcloc = GetSourceLocation( ev.srcloc );
@ -2898,9 +2912,9 @@ void View::ZoneTooltip( const ZoneEvent& ev )
const char* func; const char* func;
const char* zoneName; const char* zoneName;
if( ev.text && ev.text->zoneName ) if( ev.text != -1 && GetTextData( ev )->zoneName )
{ {
zoneName = GetString( ev.text->zoneName ); zoneName = GetString( GetTextData( ev )->zoneName );
func = GetString( srcloc.function ); func = GetString( srcloc.function );
} }
else else
@ -2926,10 +2940,10 @@ void View::ZoneTooltip( const ZoneEvent& ev )
ImGui::Text( "CPU: %i -> %i", ev.cpu_start, ev.cpu_end ); ImGui::Text( "CPU: %i -> %i", ev.cpu_start, ev.cpu_end );
} }
} }
if( ev.text && ev.text->userText ) if( ev.text != -1 && GetTextData( ev )->userText )
{ {
ImGui::Text( "" ); ImGui::Text( "" );
ImGui::TextColored( ImVec4( 0xCC / 255.f, 0xCC / 255.f, 0x22 / 255.f, 1.f ), "%s", ev.text->userText ); ImGui::TextColored( ImVec4( 0xCC / 255.f, 0xCC / 255.f, 0x22 / 255.f, 1.f ), "%s", GetTextData( ev )->userText );
} }
ImGui::EndTooltip(); ImGui::EndTooltip();
} }
@ -2957,13 +2971,21 @@ const ZoneEvent* View::GetZoneParent( const ZoneEvent& zone ) const
TextData* View::GetTextData( ZoneEvent& zone ) TextData* View::GetTextData( ZoneEvent& zone )
{ {
if( !zone.text ) if( zone.text == -1 )
{ {
zone.text = m_slab.Alloc<TextData>(); auto td = m_slab.Alloc<TextData>();
zone.text->userText = nullptr; td->userText = nullptr;
zone.text->zoneName = 0; td->zoneName = 0;
zone.text = m_textData.size();
m_textData.push_back( td );
} }
return zone.text; return m_textData[zone.text];
}
const TextData* View::GetTextData( const ZoneEvent& zone ) const
{
assert( zone.text != -1 );
return m_textData[zone.text];
} }
void View::Write( FileWrite& f ) void View::Write( FileWrite& f )
@ -3058,6 +3080,15 @@ void View::Write( FileWrite& f )
} }
} }
sz = m_textData.size();
f.Write( &sz, sizeof( sz ) );
for( auto& v : m_textData )
{
const auto ptr = (uint64_t)v->userText;
f.Write( &ptr, sizeof( ptr ) );
f.Write( &v->zoneName, sizeof( v->zoneName ) );
}
sz = m_threads.size(); sz = m_threads.size();
f.Write( &sz, sizeof( sz ) ); f.Write( &sz, sizeof( sz ) );
for( auto& thread : m_threads ) for( auto& thread : m_threads )
@ -3101,20 +3132,7 @@ void View::WriteTimeline( FileWrite& f, const Vector<ZoneEvent*>& vec )
f.Write( &v->srcloc, sizeof( v->srcloc ) ); f.Write( &v->srcloc, sizeof( v->srcloc ) );
f.Write( &v->cpu_start, sizeof( v->cpu_start ) ); f.Write( &v->cpu_start, sizeof( v->cpu_start ) );
f.Write( &v->cpu_end, sizeof( v->cpu_end ) ); f.Write( &v->cpu_end, sizeof( v->cpu_end ) );
f.Write( &v->text, sizeof( v->text ) );
if( v->text )
{
uint8_t flag = 1;
f.Write( &flag, sizeof( flag ) );
f.Write( &v->text->userText, sizeof( v->text->userText ) );
f.Write( &v->text->zoneName, sizeof( v->text->zoneName ) );
}
else
{
uint8_t flag = 0;
f.Write( &flag, sizeof( flag ) );
}
WriteTimeline( f, v->child ); WriteTimeline( f, v->child );
} }
} }
@ -3136,22 +3154,7 @@ void View::ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, const std::unorde
f.Read( &zone->srcloc, sizeof( zone->srcloc ) ); f.Read( &zone->srcloc, sizeof( zone->srcloc ) );
f.Read( &zone->cpu_start, sizeof( zone->cpu_start ) ); f.Read( &zone->cpu_start, sizeof( zone->cpu_start ) );
f.Read( &zone->cpu_end, sizeof( zone->cpu_end ) ); f.Read( &zone->cpu_end, sizeof( zone->cpu_end ) );
f.Read( &zone->text, sizeof( zone->text ) );
uint8_t flag;
f.Read( &flag, sizeof( flag ) );
if( flag )
{
zone->text = m_slab.Alloc<TextData>();
uint64_t ptr;
f.Read( &ptr, sizeof( ptr ) );
zone->text->userText = ptr == 0 ? nullptr : stringMap.find( ptr )->second;
f.Read( &zone->text->zoneName, sizeof( zone->text->zoneName ) );
}
else
{
zone->text = nullptr;
}
ReadTimeline( f, zone->child, stringMap ); ReadTimeline( f, zone->child, stringMap );
} }
} }

2
server/TracyView.hpp
View File

@ -201,6 +201,7 @@ private:
const ZoneEvent* GetZoneParent( const ZoneEvent& zone ) const; const ZoneEvent* GetZoneParent( const ZoneEvent& zone ) const;
TextData* GetTextData( ZoneEvent& zone ); TextData* GetTextData( ZoneEvent& zone );
const TextData* GetTextData( const ZoneEvent& zone ) const;
void Write( FileWrite& f ); void Write( FileWrite& f );
void WriteTimeline( FileWrite& f, const Vector<ZoneEvent*>& vec ); void WriteTimeline( FileWrite& f, const Vector<ZoneEvent*>& vec );
@ -221,6 +222,7 @@ private:
Vector<ThreadData*> m_threads; Vector<ThreadData*> m_threads;
Vector<PlotData*> m_plots; Vector<PlotData*> m_plots;
Vector<MessageData*> m_messages; Vector<MessageData*> m_messages;
Vector<TextData*> m_textData;
std::unordered_map<uint64_t, std::string> m_strings; std::unordered_map<uint64_t, std::string> m_strings;
std::unordered_map<uint64_t, std::string> m_threadNames; std::unordered_map<uint64_t, std::string> m_threadNames;
std::unordered_set<const char*, charutil::Hasher, charutil::Comparator> m_customStrings; std::unordered_set<const char*, charutil::Hasher, charutil::Comparator> m_customStrings;

4
test/test.cpp
View File

@ -10,6 +10,7 @@ void TestFunction()
{ {
std::this_thread::sleep_for( std::chrono::milliseconds( 1 ) ); std::this_thread::sleep_for( std::chrono::milliseconds( 1 ) );
ZoneScoped; ZoneScoped;
ZoneName( "Test function" );
std::this_thread::sleep_for( std::chrono::milliseconds( 1 ) ); std::this_thread::sleep_for( std::chrono::milliseconds( 1 ) );
} }
} }
@ -111,6 +112,9 @@ void DepthTest()
for(;;) for(;;)
{ {
std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) );
ZoneScoped;
const auto txt = "Fibonacci (15)";
ZoneText( txt, strlen( txt ) );
Fibonacci( 15 ); Fibonacci( 15 );
} }
} }