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

Process custom free-form zone names.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-06-29 16:12:17 +02:00
parent b29d60056a
commit 053284b1c7
4 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -7,7 +7,7 @@ Note: Release numbers are nothing more than numbers. There are some
a mistake.
v0.3.2 (xxxx-xx-xx)
v0.3.3 (xxxx-xx-xx)
-------------------
- Breaking change: the format of trace files has changed.

1
server/TracyEvent.hpp
View File

@ -81,6 +81,7 @@ struct ZoneEvent
int8_t cpu_end;
StringIdx text;
uint32_t callstack;
StringIdx name;
// This must be last. All above is read/saved as-is.
Vector<ZoneEvent*> child;

46
server/TracyWorker.cpp
View File

@ -31,7 +31,7 @@ static constexpr int FileVersion( uint8_t h5, uint8_t h6, uint8_t h7 )
return ( h5 << 16 ) | ( h6 << 8 ) | h7;
}
static const uint8_t FileHeader[8] { 't', 'r', 'a', 'c', 'y', 0, 3, 2 };
static const uint8_t FileHeader[8] { 't', 'r', 'a', 'c', 'y', 0, 3, 3 };
enum { FileHeaderMagic = 5 };
static const int CurrentVersion = FileVersion( FileHeader[FileHeaderMagic], FileHeader[FileHeaderMagic+1], FileHeader[FileHeaderMagic+2] );
@ -456,9 +456,9 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
f.Read( tid );
td->id = tid;
f.Read( td->count );
if( fileVer <= FileVersion( 0, 3, 1 ) )
if( fileVer <= FileVersion( 0, 3, 2 ) )
{
ReadTimelinePre032( f, td->timeline, CompressThread( tid ) );
ReadTimelinePre033( f, td->timeline, CompressThread( tid ), fileVer );
}
else
{
@ -1560,6 +1560,9 @@ void Worker::Process( const QueueItem& ev )
case QueueType::ZoneText:
ProcessZoneText( ev.zoneText );
break;
case QueueType::ZoneName:
ProcessZoneName( ev.zoneText );
break;
case QueueType::LockAnnounce:
ProcessLockAnnounce( ev.lockAnnounce );
break;
@ -1752,6 +1755,21 @@ void Worker::ProcessZoneText( const QueueZoneText& ev )
m_pendingCustomStrings.erase( it );
}
void Worker::ProcessZoneName( const QueueZoneText& ev )
{
auto tit = m_threadMap.find( ev.thread );
assert( tit != m_threadMap.end() );
auto td = tit->second;
auto& stack = td->stack;
assert( !stack.empty() );
auto zone = stack.back();
auto it = m_pendingCustomStrings.find( ev.text );
assert( it != m_pendingCustomStrings.end() );
zone->name = StringIdx( it->second.idx );
m_pendingCustomStrings.erase( it );
}
void Worker::ProcessLockAnnounce( const QueueLockAnnounce& ev )
{
auto it = m_data.lockMap.find( ev.id );
@ -2376,13 +2394,13 @@ void Worker::ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread
}
}
void Worker::ReadTimelinePre032( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread )
void Worker::ReadTimelinePre033( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, int fileVer )
{
uint64_t sz;
f.Read( sz );
if( sz != 0 )
{
ReadTimelinePre032( f, vec, thread, sz );
ReadTimelinePre033( f, vec, thread, sz, fileVer );
}
}
@ -2452,7 +2470,7 @@ void Worker::ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread
}
}
void Worker::ReadTimelinePre032( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, uint64_t size )
void Worker::ReadTimelinePre033( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, uint64_t size, int fileVer )
{
assert( size != 0 );
vec.reserve_non_zero( size );
@ -2464,9 +2482,19 @@ void Worker::ReadTimelinePre032( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t
vec.push_back_no_space_check( zone );
new( &zone->child ) decltype( zone->child );
f.Read( zone, 26 );
zone->callstack = 0;
ReadTimelinePre032( f, zone->child, thread );
if( fileVer <= FileVersion( 0, 3, 1 ) )
{
f.Read( zone, 26 );
zone->callstack = 0;
zone->name.__data = 0;
}
else
{
assert( fileVer <= FileVersion( 0, 3, 2 ) );
f.Read( zone, 30 );
zone->name.__data = 0;
}
ReadTimelinePre033( f, zone->child, thread, fileVer );
ReadTimelineUpdateStatistics( zone, thread );
}
}

5
server/TracyWorker.hpp
View File

@ -223,6 +223,7 @@ private:
tracy_force_inline void ProcessZoneEnd( const QueueZoneEnd& ev );
tracy_force_inline void ProcessFrameMark( const QueueFrameMark& ev );
tracy_force_inline void ProcessZoneText( const QueueZoneText& ev );
tracy_force_inline void ProcessZoneName( const QueueZoneText& ev );
tracy_force_inline void ProcessLockAnnounce( const QueueLockAnnounce& ev );
tracy_force_inline void ProcessLockWait( const QueueLockWait& ev );
tracy_force_inline void ProcessLockObtain( const QueueLockObtain& ev );
@ -290,14 +291,14 @@ private:
uint16_t CompressThreadNew( uint64_t thread );
tracy_force_inline void ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread );
tracy_force_inline void ReadTimelinePre032( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread );
tracy_force_inline void ReadTimelinePre033( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, int fileVer );
tracy_force_inline void ReadTimeline( FileRead& f, Vector<GpuEvent*>& vec );
tracy_force_inline void ReadTimelinePre032( FileRead& f, Vector<GpuEvent*>& vec );
tracy_force_inline void ReadTimelineUpdateStatistics( ZoneEvent* zone, uint16_t thread );
void ReadTimeline( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, uint64_t size );
void ReadTimelinePre032( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, uint64_t size );
void ReadTimelinePre033( FileRead& f, Vector<ZoneEvent*>& vec, uint16_t thread, uint64_t size, int fileVer );
void ReadTimeline( FileRead& f, Vector<GpuEvent*>& vec, uint64_t size );
void ReadTimelinePre032( FileRead& f, Vector<GpuEvent*>& vec, uint64_t size );