Link/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

PIDs are no longer needed in samples.

Browse Source
This commit is contained in:
Bartosz Taudul 2021-05-23 19:00:45 +02:00
parent bbd1c4505c
commit b1e4d16537
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
1 changed files with 84 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
client/TracySysTrace.cpp
View File

@ -788,7 +788,7 @@ static void SetupSampling( int64_t& samplingPeriod )
pe.type = PERF_TYPE_HARDWARE; pe.type = PERF_TYPE_HARDWARE;
pe.size = sizeof( perf_event_attr ); pe.size = sizeof( perf_event_attr );
pe.sample_freq = 10000; pe.sample_freq = 10000;
pe.sample_type = PERF_SAMPLE_IP | PERF_SAMPLE_TID; pe.sample_type = PERF_SAMPLE_IP;
pe.disabled = 1; pe.disabled = 1;
pe.exclude_kernel = 1; pe.exclude_kernel = 1;
pe.exclude_guest = 1; pe.exclude_guest = 1;
@ -888,7 +888,6 @@ static void SetupSampling( int64_t& samplingPeriod )
SetThreadName( "Tracy Sampling" ); SetThreadName( "Tracy Sampling" );
sched_param sp = { 5 }; sched_param sp = { 5 };
pthread_setschedparam( pthread_self(), SCHED_FIFO, &sp ); pthread_setschedparam( pthread_self(), SCHED_FIFO, &sp );
uint32_t currentPid = (uint32_t)getpid();
#if defined TRACY_HW_TIMER && ( defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64 ) #if defined TRACY_HW_TIMER && ( defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64 )
for( int i=0; i<s_numBuffers; i++ ) for( int i=0; i<s_numBuffers; i++ )
{ {
@ -926,75 +925,70 @@ static void SetupSampling( int64_t& samplingPeriod )
// u64 cnt // u64 cnt
// u64 ip[cnt] // u64 ip[cnt]
uint32_t pid; uint32_t tid;
s_ring[i].Read( &pid, offset, sizeof( uint32_t ) ); uint64_t t0;
if( pid == currentPid ) uint64_t cnt;
offset += sizeof( uint32_t );
s_ring[i].Read( &tid, offset, sizeof( uint32_t ) );
offset += sizeof( uint32_t );
s_ring[i].Read( &t0, offset, sizeof( uint64_t ) );
offset += sizeof( uint64_t );
s_ring[i].Read( &cnt, offset, sizeof( uint64_t ) );
offset += sizeof( uint64_t );
if( cnt > 0 )
{ {
uint32_t tid; auto trace = (uint64_t*)tracy_malloc( ( 1 + cnt ) * sizeof( uint64_t ) );
uint64_t t0; s_ring[i].Read( trace+1, offset, sizeof( uint64_t ) * cnt );
uint64_t cnt;
offset += sizeof( uint32_t );
s_ring[i].Read( &tid, offset, sizeof( uint32_t ) );
offset += sizeof( uint32_t );
s_ring[i].Read( &t0, offset, sizeof( uint64_t ) );
offset += sizeof( uint64_t );
s_ring[i].Read( &cnt, offset, sizeof( uint64_t ) );
offset += sizeof( uint64_t );
if( cnt > 0 )
{
auto trace = (uint64_t*)tracy_malloc( ( 1 + cnt ) * sizeof( uint64_t ) );
s_ring[i].Read( trace+1, offset, sizeof( uint64_t ) * cnt );
#if defined __x86_64__ || defined _M_X64 #if defined __x86_64__ || defined _M_X64
// remove non-canonical pointers // remove non-canonical pointers
do do
{ {
const auto test = (int64_t)trace[cnt]; const auto test = (int64_t)trace[cnt];
const auto m1 = test >> 63; const auto m1 = test >> 63;
const auto m2 = test >> 47; const auto m2 = test >> 47;
if( m1 == m2 ) break; if( m1 == m2 ) break;
} }
while( --cnt > 0 ); while( --cnt > 0 );
for( uint64_t j=1; j<cnt; j++ ) for( uint64_t j=1; j<cnt; j++ )
{ {
const auto test = (int64_t)trace[j]; const auto test = (int64_t)trace[j];
const auto m1 = test >> 63; const auto m1 = test >> 63;
const auto m2 = test >> 47; const auto m2 = test >> 47;
if( m1 != m2 ) trace[j] = 0; if( m1 != m2 ) trace[j] = 0;
} }
#endif #endif
// skip kernel frames // skip kernel frames
uint64_t j; uint64_t j;
for( j=0; j<cnt; j++ ) for( j=0; j<cnt; j++ )
{
if( (int64_t)trace[j+1] >= 0 ) break;
}
if( j == cnt )
{
tracy_free( trace );
}
else
{
if( j > 0 )
{ {
if( (int64_t)trace[j+1] >= 0 ) break; cnt -= j;
memmove( trace+1, trace+1+j, sizeof( uint64_t ) * cnt );
} }
if( j == cnt ) memcpy( trace, &cnt, sizeof( uint64_t ) );
{
tracy_free( trace );
}
else
{
if( j > 0 )
{
cnt -= j;
memmove( trace+1, trace+1+j, sizeof( uint64_t ) * cnt );
}
memcpy( trace, &cnt, sizeof( uint64_t ) );
#if defined TRACY_HW_TIMER && ( defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64 ) #if defined TRACY_HW_TIMER && ( defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64 )
t0 = s_ring[i].ConvertTimeToTsc( t0 ); t0 = s_ring[i].ConvertTimeToTsc( t0 );
#endif #endif
TracyLfqPrepare( QueueType::CallstackSample ); TracyLfqPrepare( QueueType::CallstackSample );
MemWrite( &item->callstackSampleFat.time, t0 ); MemWrite( &item->callstackSampleFat.time, t0 );
MemWrite( &item->callstackSampleFat.thread, (uint64_t)tid ); MemWrite( &item->callstackSampleFat.thread, (uint64_t)tid );
MemWrite( &item->callstackSampleFat.ptr, (uint64_t)trace ); MemWrite( &item->callstackSampleFat.ptr, (uint64_t)trace );
TracyLfqCommit; TracyLfqCommit;
}
} }
} }
} }
@ -1002,45 +996,39 @@ static void SetupSampling( int64_t& samplingPeriod )
{ {
// Layout: // Layout:
// u64 ip // u64 ip
// u32 pid, tid
uint32_t pid; uint64_t ip;
s_ring[i].Read( &pid, offset + sizeof( uint64_t ), sizeof( uint32_t ) ); s_ring[i].Read( &ip, offset, sizeof( uint64_t ) );
if( pid == currentPid )
QueueType type;
switch( id )
{ {
uint64_t ip; case EventCpuCycles:
s_ring[i].Read( &ip, offset, sizeof( uint64_t ) ); type = QueueType::HwSampleCpuCycle;
break;
QueueType type; case EventInstructionsRetired:
switch( id ) type = QueueType::HwSampleInstructionRetired;
{ break;
case EventCpuCycles: case EventCacheReference:
type = QueueType::HwSampleCpuCycle; type = QueueType::HwSampleCacheReference;
break; break;
case EventInstructionsRetired: case EventCacheMiss:
type = QueueType::HwSampleInstructionRetired; type = QueueType::HwSampleCacheMiss;
break; break;
case EventCacheReference: case EventBranchRetired:
type = QueueType::HwSampleCacheReference; type = QueueType::HwSampleBranchRetired;
break; break;
case EventCacheMiss: case EventBranchMiss:
type = QueueType::HwSampleCacheMiss; type = QueueType::HwSampleBranchMiss;
break; break;
case EventBranchRetired: default:
type = QueueType::HwSampleBranchRetired; assert( false );
break; break;
case EventBranchMiss:
type = QueueType::HwSampleBranchMiss;
break;
default:
assert( false );
break;
}
TracyLfqPrepare( type );
MemWrite( &item->hwSample.ip, ip );
TracyLfqCommit;
} }
TracyLfqPrepare( type );
MemWrite( &item->hwSample.ip, ip );
TracyLfqCommit;
} }
} }
s_ring[i].Advance( hdr.size ); s_ring[i].Advance( hdr.size );