zhangengru/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Source location payload transfer. No storage yet.

Browse Source
This commit is contained in:
Bartosz Taudul
2017-11-05 16:46:00 +01:00
parent 1323596ab2
commit bc77aa8d26
6 changed files with 83 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/TracyView.cpp
+45 -5
View File
@@ -520,7 +520,7 @@ close:
void View::DispatchProcess( const QueueItem& ev )
{
if( ev.hdr.type == QueueType::CustomStringData || ev.hdr.type == QueueType::StringData || ev.hdr.type == QueueType::ThreadName || ev.hdr.type == QueueType::PlotName || ev.hdr.type == QueueType::MessageData )
if( ev.hdr.type == QueueType::CustomStringData || ev.hdr.type == QueueType::StringData || ev.hdr.type == QueueType::ThreadName || ev.hdr.type == QueueType::PlotName || ev.hdr.type == QueueType::MessageData || ev.hdr.type == QueueType::SourceLocationPayload )
{
timeval tv;
tv.tv_sec = 0;
@@ -547,6 +547,9 @@ void View::DispatchProcess( const QueueItem& ev )
case QueueType::MessageData:
AddMessageData( ev.stringTransfer.ptr, buf, sz );
break;
case QueueType::SourceLocationPayload:
AddSourceLocationPayload( ev.stringTransfer.ptr, buf, sz );
break;
default:
assert( false );
break;
@@ -561,7 +564,7 @@ void View::DispatchProcess( const QueueItem& ev )
void View::DispatchProcess( const QueueItem& ev, const char*& ptr )
{
ptr += QueueDataSize[ev.hdr.idx];
if( ev.hdr.type == QueueType::CustomStringData || ev.hdr.type == QueueType::StringData || ev.hdr.type == QueueType::ThreadName || ev.hdr.type == QueueType::PlotName || ev.hdr.type == QueueType::MessageData )
if( ev.hdr.type == QueueType::CustomStringData || ev.hdr.type == QueueType::StringData || ev.hdr.type == QueueType::ThreadName || ev.hdr.type == QueueType::PlotName || ev.hdr.type == QueueType::MessageData || ev.hdr.type == QueueType::SourceLocationPayload )
{
uint16_t sz;
memcpy( &sz, ptr, sizeof( sz ) );
@@ -583,6 +586,9 @@ void View::DispatchProcess( const QueueItem& ev, const char*& ptr )
case QueueType::MessageData:
AddMessageData( ev.stringTransfer.ptr, ptr, sz );
break;
case QueueType::SourceLocationPayload:
AddSourceLocationPayload( ev.stringTransfer.ptr, ptr, sz );
break;
default:
assert( false );
break;
@@ -682,16 +688,15 @@ void View::ProcessZoneBeginAllocSrcLoc( const QueueZoneBegin& ev )
{
auto zone = m_slab.AllocInit<ZoneEvent>();
//CheckSourceLocation( ev.srcloc );
zone->start = ev.time * m_timerMul;
zone->end = -1;
//zone->srcloc = ShrinkSourceLocation( ev.srcloc );
zone->srcloc = 0;
assert( ev.cpu == 0xFFFFFFFF || ev.cpu <= std::numeric_limits<int8_t>::max() );
zone->cpu_start = ev.cpu == 0xFFFFFFFF ? -1 : (int8_t)ev.cpu;
zone->text = -1;
CheckSourceLocationPayload( ev.srcloc, zone );
std::unique_lock<std::mutex> lock( m_lock );
NewZone( zone, ev.thread );
lock.unlock();
@@ -917,6 +922,14 @@ void View::CheckSourceLocation( uint64_t ptr )
ServerQuery( ServerQuerySourceLocation, ptr );
}
void View::CheckSourceLocationPayload( uint64_t ptr, ZoneEvent* dst )
{
assert( m_pendingSourceLocationPayload.find( ptr ) == m_pendingSourceLocationPayload.end() );
m_pendingSourceLocationPayload.emplace( ptr, dst );
ServerQuery( ServerQuerySourceLocationPayload, ptr );
}
void View::AddString( uint64_t ptr, std::string&& str )
{
assert( m_strings.find( ptr ) == m_strings.end() );
@@ -972,6 +985,33 @@ void View::AddSourceLocation( const QueueSourceLocation& srcloc )
m_sourceLocation.emplace( srcloc.ptr, srcloc );
}
void View::AddSourceLocationPayload( uint64_t ptr, const char* data, size_t sz )
{
const auto start = data;
auto pit = m_pendingSourceLocationPayload.find( ptr );
assert( pit != m_pendingSourceLocationPayload.end() );
uint32_t color, line;
memcpy( &color, data, 4 );
memcpy( &line, data + 4, 4 );
data += 8;
auto end = data;
while( *end ) end++;
end++;
char* func = m_slab.Alloc<char>( end - data );
memcpy( func, data, end - data );
const auto ssz = sz - ( end - start );
char* source = m_slab.Alloc<char>( ssz+1 );
memcpy( source, end, ssz );
source[ssz] = '\0';
std::unique_lock<std::mutex> lock( m_lock );
lock.unlock();
m_pendingSourceLocationPayload.erase( ptr );
}
void View::AddMessageData( uint64_t ptr, const char* str, size_t sz )
{
auto txt = m_slab.Alloc<char>( sz+1 );