Timestamp conversion might be temporarily unavailable.

This commit is contained in:
Bartosz Taudul 2021-05-23 20:32:09 +02:00
parent 233a0bb6d6
commit cfb6d0d2ae
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
2 changed files with 47 additions and 45 deletions

View File

@ -90,7 +90,7 @@ public:
int64_t ConvertTimeToTsc( int64_t timestamp ) const int64_t ConvertTimeToTsc( int64_t timestamp ) const
{ {
assert( m_metadata->cap_user_time_zero ); if( !m_metadata->cap_user_time_zero ) return 0;
const auto time = timestamp - m_metadata->time_zero; const auto time = timestamp - m_metadata->time_zero;
const auto quot = time / m_metadata->time_mult; const auto quot = time / m_metadata->time_mult;
const auto rem = time % m_metadata->time_mult; const auto rem = time % m_metadata->time_mult;

View File

@ -959,56 +959,58 @@ static void SetupSampling( int64_t& samplingPeriod )
if( cnt > 0 ) if( cnt > 0 )
{ {
auto trace = (uint64_t*)tracy_malloc( ( 1 + cnt ) * sizeof( uint64_t ) ); #if defined TRACY_HW_TIMER && ( defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64 )
s_ring[i].Read( trace+1, offset, sizeof( uint64_t ) * cnt ); t0 = s_ring[i].ConvertTimeToTsc( t0 );
if( t0 != 0 )
#endif
{
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 m1 = test >> 63;
const auto m2 = test >> 47;
if( m1 == m2 ) break;
}
while( --cnt > 0 );
for( uint64_t j=1; j<cnt; j++ )
{
const auto test = (int64_t)trace[j];
const auto m1 = test >> 63;
const auto m2 = test >> 47;
if( m1 != m2 ) trace[j] = 0;
}
#endif
// skip kernel frames
uint64_t 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 )
{ {
cnt -= j; const auto test = (int64_t)trace[cnt];
memmove( trace+1, trace+1+j, sizeof( uint64_t ) * cnt ); const auto m1 = test >> 63;
const auto m2 = test >> 47;
if( m1 == m2 ) break;
}
while( --cnt > 0 );
for( uint64_t j=1; j<cnt; j++ )
{
const auto test = (int64_t)trace[j];
const auto m1 = test >> 63;
const auto m2 = test >> 47;
if( m1 != m2 ) trace[j] = 0;
} }
memcpy( trace, &cnt, sizeof( uint64_t ) );
#if defined TRACY_HW_TIMER && ( defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64 )
t0 = s_ring[i].ConvertTimeToTsc( t0 );
#endif #endif
TracyLfqPrepare( QueueType::CallstackSample ); // skip kernel frames
MemWrite( &item->callstackSampleFat.time, t0 ); uint64_t j;
MemWrite( &item->callstackSampleFat.thread, (uint64_t)tid ); for( j=0; j<cnt; j++ )
MemWrite( &item->callstackSampleFat.ptr, (uint64_t)trace ); {
TracyLfqCommit; if( (int64_t)trace[j+1] >= 0 ) break;
}
if( j == cnt )
{
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 ) );
TracyLfqPrepare( QueueType::CallstackSample );
MemWrite( &item->callstackSampleFat.time, t0 );
MemWrite( &item->callstackSampleFat.thread, (uint64_t)tid );
MemWrite( &item->callstackSampleFat.ptr, (uint64_t)trace );
TracyLfqCommit;
}
} }
} }
} }