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

Track list of shared locks.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-12-10 22:42:39 +01:00
parent 4d9ae83abd
commit b07718ab9e
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/TracyEvent.hpp
View File

@ -100,7 +100,10 @@ struct LockEvent
{ {
Wait, Wait,
Obtain, Obtain,
Release Release,
WaitShared,
ObtainShared,
ReleaseShared
}; };
int64_t time; int64_t time;
@ -110,6 +113,7 @@ struct LockEvent
Type type; Type type;
uint8_t lockCount; uint8_t lockCount;
uint64_t waitList; uint64_t waitList;
uint64_t sharedList;
}; };
enum { LockEventSize = sizeof( LockEvent ) }; enum { LockEventSize = sizeof( LockEvent ) };

25
server/TracyView.cpp
View File

@ -793,7 +793,7 @@ void View::ProcessLockSharedWait( const QueueLockWait& ev )
{ {
auto lev = m_slab.Alloc<LockEvent>(); auto lev = m_slab.Alloc<LockEvent>();
lev->time = ev.time * m_timerMul; lev->time = ev.time * m_timerMul;
lev->type = LockEvent::Type::Wait; lev->type = LockEvent::Type::WaitShared;
lev->srcloc = 0; lev->srcloc = 0;
auto it = m_lockMap.find( ev.id ); auto it = m_lockMap.find( ev.id );
@ -811,7 +811,7 @@ void View::ProcessLockSharedObtain( const QueueLockObtain& ev )
{ {
auto lev = m_slab.Alloc<LockEvent>(); auto lev = m_slab.Alloc<LockEvent>();
lev->time = ev.time * m_timerMul; lev->time = ev.time * m_timerMul;
lev->type = LockEvent::Type::Obtain; lev->type = LockEvent::Type::ObtainShared;
lev->srcloc = 0; lev->srcloc = 0;
assert( m_lockMap.find( ev.id ) != m_lockMap.end() ); assert( m_lockMap.find( ev.id ) != m_lockMap.end() );
@ -822,7 +822,7 @@ void View::ProcessLockSharedRelease( const QueueLockRelease& ev )
{ {
auto lev = m_slab.Alloc<LockEvent>(); auto lev = m_slab.Alloc<LockEvent>();
lev->time = ev.time * m_timerMul; lev->time = ev.time * m_timerMul;
lev->type = LockEvent::Type::Release; lev->type = LockEvent::Type::ReleaseShared;
lev->srcloc = 0; lev->srcloc = 0;
assert( m_lockMap.find( ev.id ) != m_lockMap.end() ); assert( m_lockMap.find( ev.id ) != m_lockMap.end() );
@ -847,7 +847,9 @@ void View::ProcessLockMark( const QueueLockMark& ev )
switch( (*it)->type ) switch( (*it)->type )
{ {
case LockEvent::Type::Obtain: case LockEvent::Type::Obtain:
case LockEvent::Type::ObtainShared:
case LockEvent::Type::Wait: case LockEvent::Type::Wait:
case LockEvent::Type::WaitShared:
(*it)->srcloc = ShrinkSourceLocation( ev.srcloc ); (*it)->srcloc = ShrinkSourceLocation( ev.srcloc );
return; return;
default: default:
@ -1334,12 +1336,14 @@ void View::UpdateLockCount( LockMap& lockmap, size_t pos )
uint8_t lockingThread; uint8_t lockingThread;
uint8_t lockCount; uint8_t lockCount;
uint64_t waitList; uint64_t waitList;
uint64_t sharedList;
if( pos == 0 ) if( pos == 0 )
{ {
lockingThread = 0; lockingThread = 0;
lockCount = 0; lockCount = 0;
waitList = 0; waitList = 0;
sharedList = 0;
} }
else else
{ {
@ -1347,9 +1351,12 @@ void View::UpdateLockCount( LockMap& lockmap, size_t pos )
lockingThread = tl->lockingThread; lockingThread = tl->lockingThread;
lockCount = tl->lockCount; lockCount = tl->lockCount;
waitList = tl->waitList; waitList = tl->waitList;
sharedList = tl->sharedList;
} }
const auto end = timeline.size(); const auto end = timeline.size();
// ObtainShared and ReleaseShared should assert on lockCount == 0, but
// due to the async retrieval of data from threads that not possible.
while( pos != end ) while( pos != end )
{ {
const auto tl = timeline[pos]; const auto tl = timeline[pos];
@ -1357,6 +1364,7 @@ void View::UpdateLockCount( LockMap& lockmap, size_t pos )
switch( (LockEvent::Type)tl->type ) switch( (LockEvent::Type)tl->type )
{ {
case LockEvent::Type::Wait: case LockEvent::Type::Wait:
case LockEvent::Type::WaitShared:
waitList |= tbit; waitList |= tbit;
break; break;
case LockEvent::Type::Obtain: case LockEvent::Type::Obtain:
@ -1370,11 +1378,22 @@ void View::UpdateLockCount( LockMap& lockmap, size_t pos )
assert( lockCount > 0 ); assert( lockCount > 0 );
lockCount--; lockCount--;
break; break;
case LockEvent::Type::ObtainShared:
assert( ( waitList & tbit ) != 0 );
assert( ( sharedList & tbit ) == 0 );
waitList &= ~tbit;
sharedList |= tbit;
break;
case LockEvent::Type::ReleaseShared:
assert( ( sharedList & tbit ) != 0 );
sharedList &= ~tbit;
break;
default: default:
break; break;
} }
tl->lockingThread = lockingThread; tl->lockingThread = lockingThread;
tl->waitList = waitList; tl->waitList = waitList;
tl->sharedList = sharedList;
tl->lockCount = lockCount; tl->lockCount = lockCount;
assert( tl->lockingThread == lockingThread ); assert( tl->lockingThread == lockingThread );
pos++; pos++;