mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 07:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change LockState to bitmask.

Browse Source
This commit is contained in:
Bartosz Taudul 2023-04-15 14:13:14 +02:00
parent f7a8998663
commit e68214a88a
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
2 changed files with 38 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/TracyTimelineDraw.hpp
View File

@ -72,18 +72,21 @@ struct CpuCtxDraw
enum class LockState : uint8_t struct LockState
{ {
Nothing, enum Type : uint8_t
HasLock, // green {
HasBlockingLock, // yellow Nothing = 1 << 0,
WaitLock // red HasLock = 1 << 1, // green
HasBlockingLock = 1 << 2, // yellow
WaitLock = 1 << 3 // red
};
}; };
struct LockDrawItem struct LockDrawItem
{ {
Int48 t1; Int48 t1;
LockState state; LockState::Type state;
uint32_t condensed; uint32_t condensed;
short_ptr<LockEventPtr> ptr, next; short_ptr<LockEventPtr> ptr, next;
}; };

64
server/TracyTimelineItemThread.cpp
View File

@ -643,7 +643,7 @@ void TimelineItemThread::PreprocessMessages( const TimelineContext& ctx, const V
} }
} }
static Vector<LockEventPtr>::const_iterator GetNextLockEvent( const Vector<LockEventPtr>::const_iterator& it, const Vector<LockEventPtr>::const_iterator& end, LockState& nextState, uint64_t threadBit ) static Vector<LockEventPtr>::const_iterator GetNextLockEvent( const Vector<LockEventPtr>::const_iterator& it, const Vector<LockEventPtr>::const_iterator& end, LockState::Type& nextState, uint64_t threadBit )
{ {
auto next = it; auto next = it;
next++; next++;
@ -734,12 +734,12 @@ static Vector<LockEventPtr>::const_iterator GetNextLockEvent( const Vector<LockE
return next; return next;
} }
static LockState CombineLockState( LockState state, LockState next ) static LockState::Type CombineLockState( LockState::Type state, LockState::Type next )
{ {
return (LockState)std::max( (int)state, (int)next ); return std::max( state, next );
} }
static Vector<LockEventPtr>::const_iterator GetNextLockEventShared( const Vector<LockEventPtr>::const_iterator& it, const Vector<LockEventPtr>::const_iterator& end, LockState& nextState, uint64_t threadBit ) static Vector<LockEventPtr>::const_iterator GetNextLockEventShared( const Vector<LockEventPtr>::const_iterator& it, const Vector<LockEventPtr>::const_iterator& end, LockState::Type& nextState, uint64_t threadBit )
{ {
const auto itptr = (const LockEventShared*)(const LockEvent*)it->ptr; const auto itptr = (const LockEventShared*)(const LockEvent*)it->ptr;
auto next = it; auto next = it;
@ -907,7 +907,7 @@ void TimelineItemThread::PreprocessLocks( const TimelineContext& ctx, const unor
if( vbegin > tl.begin() ) vbegin--; if( vbegin > tl.begin() ) vbegin--;
LockState state = LockState::Nothing; LockState::Type state = LockState::Nothing;
if( lockmap.type == LockType::Lockable ) if( lockmap.type == LockType::Lockable )
{ {
if( vbegin->lockCount != 0 ) if( vbegin->lockCount != 0 )
@ -946,9 +946,10 @@ void TimelineItemThread::PreprocessLocks( const TimelineContext& ctx, const unor
} }
} }
const uint8_t mask = vd.onlyContendedLocks ? ( LockState::Nothing | LockState::HasLock ) : LockState::Nothing;
if( !visible ) if( !visible )
{ {
while( vbegin < vend && ( state == LockState::Nothing || ( vd.onlyContendedLocks && state == LockState::HasLock ) ) ) while( vbegin < vend && ( state & mask ) != 0 )
{ {
vbegin = GetNextLockFunc( vbegin, vend, state, threadBit ); vbegin = GetNextLockFunc( vbegin, vend, state, threadBit );
} }
@ -959,39 +960,26 @@ void TimelineItemThread::PreprocessLocks( const TimelineContext& ctx, const unor
auto& dst = drawPtr->data; auto& dst = drawPtr->data;
for(;;) for(;;)
{ {
if( vd.onlyContendedLocks ) while( vbegin < vend && ( state & mask ) != 0 )
{
while( vbegin < vend && ( state == LockState::Nothing || state == LockState::HasLock ) )
{ {
vbegin = GetNextLockFunc( vbegin, vend, state, threadBit ); vbegin = GetNextLockFunc( vbegin, vend, state, threadBit );
} }
}
else
{
while( vbegin < vend && state == LockState::Nothing )
{
vbegin = GetNextLockFunc( vbegin, vend, state, threadBit );
}
}
if( vbegin >= vend ) break; if( vbegin >= vend ) break;
assert( state != LockState::Nothing && ( !vd.onlyContendedLocks || state != LockState::HasLock ) ); assert( ( state & mask ) == 0 );
LockState drawState = state; LockState::Type drawState = state;
auto next = GetNextLockFunc( vbegin, vend, state, threadBit ); auto next = GetNextLockFunc( vbegin, vend, state, threadBit );
auto t0 = vbegin->ptr->Time(); auto t0 = vbegin->ptr->Time();
int64_t t1 = next == tl.end() ? m_worker.GetLastTime() : next->ptr->Time(); int64_t t1 = next == tl.end() ? m_worker.GetLastTime() : next->ptr->Time();
uint32_t condensed = 0; uint32_t condensed = 0;
if( vd.onlyContendedLocks )
{
for(;;) for(;;)
{ {
if( next >= vend || t1 - t0 > MinVisNs ) break; if( next >= vend || t1 - t0 > MinVisNs ) break;
auto n = next; auto n = next;
auto ns = state; auto ns = state;
while( n < vend && ( ns == LockState::Nothing || ns == LockState::HasLock ) ) while( n < vend && ( ns & mask ) != 0 )
{ {
n = GetNextLockFunc( n, vend, ns, threadBit ); n = GetNextLockFunc( n, vend, ns, threadBit );
} }
@ -1004,40 +992,12 @@ void TimelineItemThread::PreprocessLocks( const TimelineContext& ctx, const unor
condensed++; condensed++;
const auto t2 = n == tl.end() ? m_worker.GetLastTime() : n->ptr->Time(); const auto t2 = n == tl.end() ? m_worker.GetLastTime() : n->ptr->Time();
if( t2 - t1 > MinVisNs ) break; if( t2 - t1 > MinVisNs ) break;
if( drawState != ns && t2 - t0 > MinVisNs && !( ns == LockState::Nothing || ns == LockState::HasLock ) ) break; if( drawState != ns && t2 - t0 > MinVisNs && ( ns & mask ) == 0 ) break;
t0 = t1; t0 = t1;
t1 = t2; t1 = t2;
next = n; next = n;
state = ns; state = ns;
} }
}
else
{
for(;;)
{
if( next >= vend || t1 - t0 > MinVisNs ) break;
auto n = next;
auto ns = state;
while( n < vend && ns == LockState::Nothing )
{
n = GetNextLockFunc( n, vend, ns, threadBit );
}
if( n >= vend ) break;
if( n == next )
{
n = GetNextLockFunc( n, vend, ns, threadBit );
}
drawState = CombineLockState( drawState, state );
condensed++;
const auto t2 = n == tl.end() ? m_worker.GetLastTime() : n->ptr->Time();
if( t2 - t1 > MinVisNs ) break;
if( drawState != ns && t2 - t0 > MinVisNs && ns != LockState::Nothing ) break;
t0 = t1;
t1 = t2;
next = n;
state = ns;
}
}
dst.emplace_back( LockDrawItem { t1, drawState, condensed, vbegin, next } ); dst.emplace_back( LockDrawItem { t1, drawState, condensed, vbegin, next } );