mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 10:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Even simpler lock state combining.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-11-26 21:37:57 +01:00
parent 50795cdf43
commit eeca0676df
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/TracyView.cpp
View File

@ -2746,10 +2746,10 @@ static inline bool AreOtherWaiting( uint64_t bitlist, uint8_t thread )
enum class LockState enum class LockState
{ {
Nothing = 1 << 0, Nothing,
HasLock = 1 << 1, // green HasLock, // green
HasBlockingLock = 1 << 2, // yellow HasBlockingLock, // yellow
WaitLock = 1 << 3, // red WaitLock // red
}; };
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 )
@ -2849,22 +2849,7 @@ static Vector<LockEvent*>::iterator GetNextLockEvent( const Vector<LockEvent*>::
static LockState CombineLockState( LockState state, LockState next ) static LockState CombineLockState( LockState state, LockState next )
{ {
unsigned val = (unsigned)state | (unsigned)next; return (LockState)std::max( (int)state, (int)next );
#ifdef _MSC_VER
DWORD ret;
_BitScanReverse( &ret, val );
return (LockState)( 1 << ret );
#else
unsigned ret = 1;
val >>= 1;
while( val )
{
ret <<= 1;
val >>= 1;
}
return (LockState)ret;
#endif
} }
int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos, int _offset, LockHighlight& highlight ) int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos, int _offset, LockHighlight& highlight )