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

Fix calculation of thread lock extent.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-02-24 17:30:18 +01:00
parent 271d7ccaa3
commit 021d369b80
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/TracyView.cpp
View File

@ -2105,26 +2105,12 @@ void View::DrawZones()
if( it == lockmap.threadMap.end() ) continue; if( it == lockmap.threadMap.end() ) continue;
lockCnt++; lockCnt++;
const auto thread = it->second; const auto thread = it->second;
const auto threadBit = GetThreadBit( thread ); auto lptr = lockmap.timeline.data();
if( lockmap.type == LockType::Lockable ) auto eptr = lptr + lockmap.timeline.size() - 1;
{ while( (*lptr)->thread != thread ) lptr++;
auto lptr = lockmap.timeline.data(); if( (*lptr)->time < first ) first = (*lptr)->time;
auto eptr = lptr + lockmap.timeline.size() - 1; while( (*eptr)->thread != thread ) eptr--;
while( (*lptr)->time < first && (*lptr)->lockingThread != thread && !IsThreadWaiting( (*lptr)->waitList, threadBit ) ) lptr++; if( (*eptr)->time > last ) last = (*eptr)->time;
if( (*lptr)->time < first ) first = (*lptr)->time;
while( (*eptr)->time > last && (*eptr)->lockingThread != thread && !IsThreadWaiting( (*eptr)->waitList, threadBit ) ) eptr--;
if( (*eptr)->time > last ) last = (*eptr)->time;
}
else
{
assert( lockmap.type == LockType::SharedLockable );
auto lptr = (LockEventShared**)lockmap.timeline.data();
auto eptr = lptr + lockmap.timeline.size() - 1;
while( (*lptr)->time < first && (*lptr)->lockingThread != thread && !IsThreadWaiting( (*lptr)->waitList, threadBit ) && !IsThreadWaiting( (*lptr)->sharedList, threadBit ) && !IsThreadWaiting( (*lptr)->waitShared, threadBit ) ) lptr++;
if( (*lptr)->time < first ) first = (*lptr)->time;
while( (*eptr)->time > last && (*eptr)->lockingThread != thread && !IsThreadWaiting( (*eptr)->waitList, threadBit ) && !IsThreadWaiting( (*eptr)->sharedList, threadBit ) && !IsThreadWaiting( (*eptr)->waitShared, threadBit ) ) eptr--;
if( (*eptr)->time > last ) last = (*eptr)->time;
}
} }
if( last >= 0 ) if( last >= 0 )