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

Use slab allocator for server allocations.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-10-21 13:01:57 +02:00
parent 07cb693cbb
commit 807d3c42be
3 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/TracySlab.hpp
View File

@ -57,6 +57,12 @@ public:
return (T*)AllocRaw( sizeof( T ) ); return (T*)AllocRaw( sizeof( T ) );
} }
template<typename T>
T* Alloc( size_t size )
{
return (T*)AllocRaw( sizeof( T ) * size );
}
void Unalloc( size_t size ) void Unalloc( size_t size )
{ {
assert( size <= m_offset ); assert( size <= m_offset );

52
server/TracyView.cpp
View File

@ -42,12 +42,6 @@ namespace tracy
enum { MinVisSize = 3 }; enum { MinVisSize = 3 };
static TextData* GetTextData( Event& zone )
{
if( !zone.text ) zone.text = new TextData {};
return zone.text;
}
static View* s_instance = nullptr; static View* s_instance = nullptr;
View::View( const char* addr ) View::View( const char* addr )
@ -174,7 +168,7 @@ View::View( FileRead& f )
f.Read( &ptr, sizeof( ptr ) ); f.Read( &ptr, sizeof( ptr ) );
uint64_t ssz; uint64_t ssz;
f.Read( &ssz, sizeof( ssz ) ); f.Read( &ssz, sizeof( ssz ) );
auto dst = new char[ssz+1]; auto dst = m_slab.Alloc<char>( ssz+1 );
f.Read( dst, ssz ); f.Read( dst, ssz );
dst[ssz] = '\0'; dst[ssz] = '\0';
m_customStrings.emplace( dst ); m_customStrings.emplace( dst );
@ -224,7 +218,7 @@ View::View( FileRead& f )
{ {
uint64_t ptr, tsz; uint64_t ptr, tsz;
f.Read( &ptr, sizeof( ptr ) ); f.Read( &ptr, sizeof( ptr ) );
auto msgdata = new MessageData; auto msgdata = m_slab.Alloc<MessageData>();
f.Read( &msgdata->_time_literal, sizeof( msgdata->_time_literal ) ); f.Read( &msgdata->_time_literal, sizeof( msgdata->_time_literal ) );
if( msgdata->literal ) if( msgdata->literal )
{ {
@ -233,7 +227,7 @@ View::View( FileRead& f )
else else
{ {
f.Read( &tsz, sizeof( tsz ) ); f.Read( &tsz, sizeof( tsz ) );
auto txt = new char[tsz+1]; auto txt = m_slab.Alloc<char>( tsz+1 );
f.Read( txt, tsz ); f.Read( txt, tsz );
txt[tsz] = '\0'; txt[tsz] = '\0';
msgdata->txt = txt; msgdata->txt = txt;
@ -246,7 +240,7 @@ View::View( FileRead& f )
m_threads.reserve( sz ); m_threads.reserve( sz );
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )
{ {
auto td = new ThreadData; auto td = m_slab.AllocInit<ThreadData>();
f.Read( &td->id, sizeof( td->id ) ); f.Read( &td->id, sizeof( td->id ) );
ReadTimeline( f, td->timeline, nullptr, stringMap ); ReadTimeline( f, td->timeline, nullptr, stringMap );
uint64_t msz; uint64_t msz;
@ -266,7 +260,7 @@ View::View( FileRead& f )
m_plots.reserve( sz ); m_plots.reserve( sz );
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )
{ {
auto pd = new PlotData; auto pd = m_slab.AllocInit<PlotData>();
f.Read( &pd->name, sizeof( pd->name ) ); f.Read( &pd->name, sizeof( pd->name ) );
f.Read( &pd->min, sizeof( pd->min ) ); f.Read( &pd->min, sizeof( pd->min ) );
f.Read( &pd->max, sizeof( pd->max ) ); f.Read( &pd->max, sizeof( pd->max ) );
@ -757,7 +751,7 @@ void View::ProcessMessage( const QueueMessage& ev )
void View::ProcessMessageLiteral( const QueueMessage& ev ) void View::ProcessMessageLiteral( const QueueMessage& ev )
{ {
CheckString( ev.text ); CheckString( ev.text );
auto msg = new MessageData; auto msg = m_slab.Alloc<MessageData>();
msg->time = int64_t( ev.time * m_timerMul ); msg->time = int64_t( ev.time * m_timerMul );
msg->literal = true; msg->literal = true;
msg->str = ev.text; msg->str = ev.text;
@ -831,7 +825,7 @@ void View::AddCustomString( uint64_t ptr, std::string&& str )
if( sit == m_customStrings.end() ) if( sit == m_customStrings.end() )
{ {
const auto sz = str.size(); const auto sz = str.size();
auto ptr = new char[sz+1]; auto ptr = m_slab.Alloc<char>( sz+1 );
memcpy( ptr, str.c_str(), sz ); memcpy( ptr, str.c_str(), sz );
ptr[sz] = '\0'; ptr[sz] = '\0';
GetTextData( *pit->second )->userText = ptr; GetTextData( *pit->second )->userText = ptr;
@ -859,13 +853,13 @@ void View::AddSourceLocation( const QueueSourceLocation& srcloc )
void View::AddMessageData( uint64_t ptr, const char* str, size_t sz ) void View::AddMessageData( uint64_t ptr, const char* str, size_t sz )
{ {
auto txt = new char[sz+1]; auto txt = m_slab.Alloc<char>( sz+1 );
memcpy( txt, str, sz ); memcpy( txt, str, sz );
txt[sz] = '\0'; txt[sz] = '\0';
auto it = m_pendingMessages.find( ptr ); auto it = m_pendingMessages.find( ptr );
assert( it != m_pendingMessages.end() ); assert( it != m_pendingMessages.end() );
auto msg = new MessageData; auto msg = m_slab.Alloc<MessageData>();
msg->time = it->second.time; msg->time = it->second.time;
msg->literal = false; msg->literal = false;
msg->txt = txt; msg->txt = txt;
@ -891,7 +885,10 @@ void View::InsertMessageData( MessageData* msg, uint64_t thread )
if( tit == m_threadMap.end() ) if( tit == m_threadMap.end() )
{ {
m_threadMap.emplace( thread, (uint32_t)m_threads.size() ); m_threadMap.emplace( thread, (uint32_t)m_threads.size() );
m_threads.push_back( new ThreadData { thread, true } ); auto td = m_slab.AllocInit<ThreadData>();
td->id = thread;
td->enabled = true;
m_threads.push_back( td );
vec = &m_threads.back()->messages; vec = &m_threads.back()->messages;
} }
else else
@ -919,7 +916,10 @@ void View::NewZone( Event* zone, uint64_t thread )
{ {
CheckThreadString( thread ); CheckThreadString( thread );
m_threadMap.emplace( thread, (uint32_t)m_threads.size() ); m_threadMap.emplace( thread, (uint32_t)m_threads.size() );
m_threads.push_back( new ThreadData { thread, true } ); auto td = m_slab.AllocInit<ThreadData>();
td->id = thread;
td->enabled = true;
m_threads.push_back( td );
timeline = &m_threads.back()->timeline; timeline = &m_threads.back()->timeline;
} }
else else
@ -967,7 +967,10 @@ void View::InsertLockEvent( LockMap& lockmap, LockEvent* lev, uint64_t thread )
{ {
CheckThreadString( thread ); CheckThreadString( thread );
m_threadMap.emplace( thread, (uint32_t)m_threads.size() ); m_threadMap.emplace( thread, (uint32_t)m_threads.size() );
m_threads.push_back( new ThreadData { thread, true } ); auto td = m_slab.AllocInit<ThreadData>();
td->id = thread;
td->enabled = true;
m_threads.push_back( td );
} }
auto it = lockmap.threadMap.find( thread ); auto it = lockmap.threadMap.find( thread );
@ -2891,6 +2894,17 @@ void View::ZoneTooltip( const Event& ev )
ImGui::EndTooltip(); ImGui::EndTooltip();
} }
TextData* View::GetTextData( Event& zone )
{
if( !zone.text )
{
zone.text = m_slab.Alloc<TextData>();
zone.text->userText = nullptr;
zone.text->zoneName = 0;
}
return zone.text;
}
void View::Write( FileWrite& f ) void View::Write( FileWrite& f )
{ {
f.Write( &m_delay, sizeof( m_delay ) ); f.Write( &m_delay, sizeof( m_delay ) );
@ -3066,7 +3080,7 @@ void View::ReadTimeline( FileRead& f, Vector<Event*>& vec, Event* parent, const
f.Read( &flag, sizeof( flag ) ); f.Read( &flag, sizeof( flag ) );
if( flag ) if( flag )
{ {
zone->text = new TextData; zone->text = m_slab.Alloc<TextData>();
uint64_t ptr; uint64_t ptr;
f.Read( &ptr, sizeof( ptr ) ); f.Read( &ptr, sizeof( ptr ) );
zone->text->userText = ptr == 0 ? nullptr : stringMap.find( ptr )->second; zone->text->userText = ptr == 0 ? nullptr : stringMap.find( ptr )->second;

2
server/TracyView.hpp
View File

@ -185,6 +185,8 @@ private:
void ZoomToZone( const Event& ev ); void ZoomToZone( const Event& ev );
void ZoneTooltip( const Event& ev ); void ZoneTooltip( const Event& ev );
TextData* GetTextData( Event& zone );
void Write( FileWrite& f ); void Write( FileWrite& f );
void WriteTimeline( FileWrite& f, const Vector<Event*>& vec ); void WriteTimeline( FileWrite& f, const Vector<Event*>& vec );
void ReadTimeline( FileRead& f, Vector<Event*>& vec, Event* parent, const std::unordered_map<uint64_t, const char*>& stringMap ); void ReadTimeline( FileRead& f, Vector<Event*>& vec, Event* parent, const std::unordered_map<uint64_t, const char*>& stringMap );