mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-03 22:13:51 +00:00
Code Issues Releases Wiki Activity

Combine wait lists.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-12-10 23:33:39 +01:00
parent 340506406e
commit 6f1a99e270
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/TracyView.cpp
View File

@ -2859,12 +2859,13 @@ static Vector<LockEvent*>::iterator GetNextLockEvent( const Vector<LockEvent*>::
{ {
if( (*next)->lockCount != 0 ) if( (*next)->lockCount != 0 )
{ {
const auto wait = (*next)->waitList | (*next)->waitShared;
if( GetThreadBit( (*next)->lockingThread ) == threadBit ) if( GetThreadBit( (*next)->lockingThread ) == threadBit )
{ {
nextState = ( AreOtherWaiting( (*next)->waitList, threadBit ) || AreOtherWaiting( (*next)->waitShared, threadBit ) ) ? LockState::HasBlockingLock : LockState::HasLock; nextState = AreOtherWaiting( wait, threadBit ) ? LockState::HasBlockingLock : LockState::HasLock;
break; break;
} }
else if( IsThreadWaiting( (*next)->waitList, threadBit ) || IsThreadWaiting( (*next)->waitShared, threadBit ) ) else if( IsThreadWaiting( wait, threadBit ) )
{ {
nextState = LockState::WaitLock; nextState = LockState::WaitLock;
break; break;
@ -2931,7 +2932,8 @@ static Vector<LockEvent*>::iterator GetNextLockEvent( const Vector<LockEvent*>::
{ {
if( GetThreadBit( (*next)->lockingThread ) == threadBit ) if( GetThreadBit( (*next)->lockingThread ) == threadBit )
{ {
nextState = ( AreOtherWaiting( (*next)->waitList, threadBit ) || AreOtherWaiting( (*next)->waitShared, threadBit ) ) ? LockState::HasBlockingLock : LockState::HasLock; const auto wait = (*next)->waitList | (*next)->waitShared;
nextState = AreOtherWaiting( wait, threadBit ) ? LockState::HasBlockingLock : LockState::HasLock;
break; break;
} }
if( IsThreadWaiting( (*next)->sharedList, threadBit ) ) if( IsThreadWaiting( (*next)->sharedList, threadBit ) )