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

Don't reconstruct lock event time on insert.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-10-24 23:25:04 +02:00
parent b83d0f46d9
commit 1fe76be955
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
server/TracyWorker.cpp
View File

@ -2743,10 +2743,9 @@ void Worker::NewZone( ZoneEvent* zone, uint64_t thread )
td->nextZoneId = 0; td->nextZoneId = 0;
} }
void Worker::InsertLockEvent( LockMap& lockmap, LockEvent* lev, uint64_t thread ) void Worker::InsertLockEvent( LockMap& lockmap, LockEvent* lev, uint64_t thread, int64_t time )
{ {
const auto lt = lev->Time(); if( m_data.lastTime < time ) m_data.lastTime = time;
m_data.lastTime = std::max( m_data.lastTime, lt );
NoticeThread( thread ); NoticeThread( thread );
@ -2773,8 +2772,8 @@ void Worker::InsertLockEvent( LockMap& lockmap, LockEvent* lev, uint64_t thread
} }
auto& range = lockmap.range[it->second]; auto& range = lockmap.range[it->second];
if( range.start > lt ) range.start = lt; if( range.start > time ) range.start = time;
if( range.end < lt ) range.end = lt; if( range.end < time ) range.end = time;
} }
void Worker::CheckString( uint64_t ptr ) void Worker::CheckString( uint64_t ptr )
@ -3803,11 +3802,12 @@ void Worker::ProcessLockWait( const QueueLockWait& ev )
auto lev = ev.type == LockType::Lockable ? m_slab.Alloc<LockEvent>() : m_slab.Alloc<LockEventShared>(); auto lev = ev.type == LockType::Lockable ? m_slab.Alloc<LockEvent>() : m_slab.Alloc<LockEventShared>();
const auto refTime = m_refTimeSerial + ev.time; const auto refTime = m_refTimeSerial + ev.time;
m_refTimeSerial = refTime; m_refTimeSerial = refTime;
lev->SetTime( TscTime( refTime - m_data.baseTime ) ); const auto time = TscTime( refTime - m_data.baseTime );
lev->SetTime( time );
lev->SetSrcLoc( 0 ); lev->SetSrcLoc( 0 );
lev->type = LockEvent::Type::Wait; lev->type = LockEvent::Type::Wait;
InsertLockEvent( *it->second, lev, ev.thread ); InsertLockEvent( *it->second, lev, ev.thread, time );
} }
void Worker::ProcessLockObtain( const QueueLockObtain& ev ) void Worker::ProcessLockObtain( const QueueLockObtain& ev )
@ -3819,11 +3819,12 @@ void Worker::ProcessLockObtain( const QueueLockObtain& ev )
auto lev = lock.type == LockType::Lockable ? m_slab.Alloc<LockEvent>() : m_slab.Alloc<LockEventShared>(); auto lev = lock.type == LockType::Lockable ? m_slab.Alloc<LockEvent>() : m_slab.Alloc<LockEventShared>();
const auto refTime = m_refTimeSerial + ev.time; const auto refTime = m_refTimeSerial + ev.time;
m_refTimeSerial = refTime; m_refTimeSerial = refTime;
lev->SetTime( TscTime( refTime - m_data.baseTime ) ); const auto time = TscTime( refTime - m_data.baseTime );
lev->SetTime( time );
lev->SetSrcLoc( 0 ); lev->SetSrcLoc( 0 );
lev->type = LockEvent::Type::Obtain; lev->type = LockEvent::Type::Obtain;
InsertLockEvent( lock, lev, ev.thread ); InsertLockEvent( lock, lev, ev.thread, time );
} }
void Worker::ProcessLockRelease( const QueueLockRelease& ev ) void Worker::ProcessLockRelease( const QueueLockRelease& ev )
@ -3835,11 +3836,12 @@ void Worker::ProcessLockRelease( const QueueLockRelease& ev )
auto lev = lock.type == LockType::Lockable ? m_slab.Alloc<LockEvent>() : m_slab.Alloc<LockEventShared>(); auto lev = lock.type == LockType::Lockable ? m_slab.Alloc<LockEvent>() : m_slab.Alloc<LockEventShared>();
const auto refTime = m_refTimeSerial + ev.time; const auto refTime = m_refTimeSerial + ev.time;
m_refTimeSerial = refTime; m_refTimeSerial = refTime;
lev->SetTime( TscTime( refTime - m_data.baseTime ) ); const auto time = TscTime( refTime - m_data.baseTime );
lev->SetTime( time );
lev->SetSrcLoc( 0 ); lev->SetSrcLoc( 0 );
lev->type = LockEvent::Type::Release; lev->type = LockEvent::Type::Release;
InsertLockEvent( lock, lev, ev.thread ); InsertLockEvent( lock, lev, ev.thread, time );
} }
void Worker::ProcessLockSharedWait( const QueueLockWait& ev ) void Worker::ProcessLockSharedWait( const QueueLockWait& ev )
@ -3858,11 +3860,12 @@ void Worker::ProcessLockSharedWait( const QueueLockWait& ev )
auto lev = m_slab.Alloc<LockEventShared>(); auto lev = m_slab.Alloc<LockEventShared>();
const auto refTime = m_refTimeSerial + ev.time; const auto refTime = m_refTimeSerial + ev.time;
m_refTimeSerial = refTime; m_refTimeSerial = refTime;
lev->SetTime( TscTime( refTime - m_data.baseTime ) ); const auto time = TscTime( refTime - m_data.baseTime );
lev->SetTime( time );
lev->SetSrcLoc( 0 ); lev->SetSrcLoc( 0 );
lev->type = LockEvent::Type::WaitShared; lev->type = LockEvent::Type::WaitShared;
InsertLockEvent( *it->second, lev, ev.thread ); InsertLockEvent( *it->second, lev, ev.thread, time );
} }
void Worker::ProcessLockSharedObtain( const QueueLockObtain& ev ) void Worker::ProcessLockSharedObtain( const QueueLockObtain& ev )
@ -3875,11 +3878,12 @@ void Worker::ProcessLockSharedObtain( const QueueLockObtain& ev )
auto lev = m_slab.Alloc<LockEventShared>(); auto lev = m_slab.Alloc<LockEventShared>();
const auto refTime = m_refTimeSerial + ev.time; const auto refTime = m_refTimeSerial + ev.time;
m_refTimeSerial = refTime; m_refTimeSerial = refTime;
lev->SetTime( TscTime( refTime - m_data.baseTime ) ); const auto time = TscTime( refTime - m_data.baseTime );
lev->SetTime( time );
lev->SetSrcLoc( 0 ); lev->SetSrcLoc( 0 );
lev->type = LockEvent::Type::ObtainShared; lev->type = LockEvent::Type::ObtainShared;
InsertLockEvent( lock, lev, ev.thread ); InsertLockEvent( lock, lev, ev.thread, time );
} }
void Worker::ProcessLockSharedRelease( const QueueLockRelease& ev ) void Worker::ProcessLockSharedRelease( const QueueLockRelease& ev )
@ -3892,11 +3896,12 @@ void Worker::ProcessLockSharedRelease( const QueueLockRelease& ev )
auto lev = m_slab.Alloc<LockEventShared>(); auto lev = m_slab.Alloc<LockEventShared>();
const auto refTime = m_refTimeSerial + ev.time; const auto refTime = m_refTimeSerial + ev.time;
m_refTimeSerial = refTime; m_refTimeSerial = refTime;
lev->SetTime( TscTime( refTime - m_data.baseTime ) ); const auto time = TscTime( refTime - m_data.baseTime );
lev->SetTime( time );
lev->SetSrcLoc( 0 ); lev->SetSrcLoc( 0 );
lev->type = LockEvent::Type::ReleaseShared; lev->type = LockEvent::Type::ReleaseShared;
InsertLockEvent( lock, lev, ev.thread ); InsertLockEvent( lock, lev, ev.thread, time );
} }
void Worker::ProcessLockMark( const QueueLockMark& ev ) void Worker::ProcessLockMark( const QueueLockMark& ev )

2
server/TracyWorker.hpp
View File

@ -497,7 +497,7 @@ private:
tracy_force_inline void NewZone( ZoneEvent* zone, uint64_t thread ); tracy_force_inline void NewZone( ZoneEvent* zone, uint64_t thread );
void InsertLockEvent( LockMap& lockmap, LockEvent* lev, uint64_t thread ); void InsertLockEvent( LockMap& lockmap, LockEvent* lev, uint64_t thread, int64_t time );
void CheckString( uint64_t ptr ); void CheckString( uint64_t ptr );
void CheckThreadString( uint64_t id ); void CheckThreadString( uint64_t id );