mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-27 08:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Calculate and use thread bit.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-12-05 22:09:53 +01:00
parent b578554223
commit 52df06d478
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server/TracyView.cpp
View File

@ -2729,14 +2729,19 @@ int View::DrawGpuZoneLevel( const Vector<GpuEvent*>& vec, bool hover, double pxn
return maxdepth; return maxdepth;
} }
static inline bool IsThreadWaiting( uint64_t bitlist, uint8_t thread ) static inline uint64_t GetThreadBit( uint8_t thread )
{ {
return ( bitlist & ( uint64_t( 1 ) << thread ) ) != 0; return uint64_t( 1 ) << thread;
} }
static inline bool AreOtherWaiting( uint64_t bitlist, uint8_t thread ) static inline bool IsThreadWaiting( uint64_t bitlist, uint64_t threadBit )
{ {
return ( bitlist & ~( uint64_t( 1 ) << thread ) ) != 0; return ( bitlist & threadBit ) != 0;
}
static inline bool AreOtherWaiting( uint64_t bitlist, uint64_t threadBit )
{
return ( bitlist & ~threadBit ) != 0;
} }
enum class LockState enum class LockState
@ -2749,6 +2754,8 @@ enum class LockState
static Vector<LockEvent*>::iterator GetNextLockEvent( const Vector<LockEvent*>::iterator& it, const Vector<LockEvent*>::iterator& end, LockState state, LockState& nextState, uint8_t thread ) static Vector<LockEvent*>::iterator GetNextLockEvent( const Vector<LockEvent*>::iterator& it, const Vector<LockEvent*>::iterator& end, LockState state, LockState& nextState, uint8_t thread )
{ {
const auto threadBit = GetThreadBit( thread );
nextState = LockState::Nothing; nextState = LockState::Nothing;
auto next = it; auto next = it;
next++; next++;
@ -2762,10 +2769,10 @@ static Vector<LockEvent*>::iterator GetNextLockEvent( const Vector<LockEvent*>::
{ {
if( (*next)->lockingThread == thread ) if( (*next)->lockingThread == thread )
{ {
nextState = AreOtherWaiting( (*next)->waitList, thread ) ? LockState::HasBlockingLock : LockState::HasLock; nextState = AreOtherWaiting( (*next)->waitList, threadBit ) ? LockState::HasBlockingLock : LockState::HasLock;
break; break;
} }
else if( IsThreadWaiting( (*next)->waitList, thread ) ) else if( IsThreadWaiting( (*next)->waitList, threadBit ) )
{ {
nextState = LockState::WaitLock; nextState = LockState::WaitLock;
break; break;
@ -2785,7 +2792,7 @@ static Vector<LockEvent*>::iterator GetNextLockEvent( const Vector<LockEvent*>::
} }
if( (*next)->waitList != 0 ) if( (*next)->waitList != 0 )
{ {
if( AreOtherWaiting( (*next)->waitList, thread ) ) if( AreOtherWaiting( (*next)->waitList, threadBit ) )
{ {
nextState = LockState::HasBlockingLock; nextState = LockState::HasBlockingLock;
} }
@ -2820,7 +2827,7 @@ static Vector<LockEvent*>::iterator GetNextLockEvent( const Vector<LockEvent*>::
{ {
if( (*next)->lockingThread == thread ) if( (*next)->lockingThread == thread )
{ {
nextState = AreOtherWaiting( (*next)->waitList, thread ) ? LockState::HasBlockingLock : LockState::HasLock; nextState = AreOtherWaiting( (*next)->waitList, threadBit ) ? LockState::HasBlockingLock : LockState::HasLock;
break; break;
} }
if( (*next)->lockingThread != (*it)->lockingThread ) if( (*next)->lockingThread != (*it)->lockingThread )
@ -2870,6 +2877,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
if( tl.back()->time < m_zvStart ) continue; if( tl.back()->time < m_zvStart ) continue;
const auto thread = it->second; const auto thread = it->second;
const auto threadBit = GetThreadBit( thread );
auto vbegin = std::lower_bound( tl.begin(), tl.end(), m_zvStart - m_delay, [] ( const auto& l, const auto& r ) { return l->time < r; } ); auto vbegin = std::lower_bound( tl.begin(), tl.end(), m_zvStart - m_delay, [] ( const auto& l, const auto& r ) { return l->time < r; } );
const auto vend = std::lower_bound( vbegin, tl.end(), m_zvEnd + m_resolution, [] ( const auto& l, const auto& r ) { return l->time < r; } ); const auto vend = std::lower_bound( vbegin, tl.end(), m_zvEnd + m_resolution, [] ( const auto& l, const auto& r ) { return l->time < r; } );
@ -2885,9 +2893,9 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
{ {
if( (*vbegin)->lockingThread == thread ) if( (*vbegin)->lockingThread == thread )
{ {
state = AreOtherWaiting( (*vbegin)->waitList, thread ) ? LockState::HasBlockingLock : LockState::HasLock; state = AreOtherWaiting( (*vbegin)->waitList, threadBit ) ? LockState::HasBlockingLock : LockState::HasLock;
} }
else if( IsThreadWaiting( (*vbegin)->waitList, thread ) ) else if( IsThreadWaiting( (*vbegin)->waitList, threadBit ) )
{ {
state = LockState::WaitLock; state = LockState::WaitLock;
} }
@ -3006,7 +3014,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
{ {
if( (*it)->thread == thread ) if( (*it)->thread == thread )
{ {
if( ( (*it)->lockingThread == thread || IsThreadWaiting( (*it)->waitList, thread ) ) && (*it)->srcloc != 0 ) if( ( (*it)->lockingThread == thread || IsThreadWaiting( (*it)->waitList, threadBit ) ) && (*it)->srcloc != 0 )
{ {
markloc = (*it)->srcloc; markloc = (*it)->srcloc;
break; break;
@ -3037,7 +3045,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
} }
if( (*vbegin)->waitList != 0 ) if( (*vbegin)->waitList != 0 )
{ {
assert( !AreOtherWaiting( (*next)->waitList, thread ) ); assert( !AreOtherWaiting( (*next)->waitList, threadBit ) );
ImGui::Text( "Recursive lock acquire in thread." ); ImGui::Text( "Recursive lock acquire in thread." );
} }
break; break;