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

Better lock merging.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-10-28 15:29:25 +02:00
parent 958e472751
commit 6832a4ae57
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/TracyView.cpp
View File

@ -2343,12 +2343,13 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
const auto t0 = (*vbegin)->time;
int64_t t1 = next == tl.end() ? GetLastTime() : (*next)->time;
const auto px0 = ( t0 - m_zvStart ) * pxns;
auto tx0 = px0;
double px1 = ( t1 - m_zvStart ) * pxns;
bool condensed = false;
for(;;)
{
if( next >= vend || px1 - px0 > MinVisSize ) break;
if( next >= vend || px1 - tx0 > MinVisSize ) break;
auto n = next;
auto ns = nextState;
while( n < vend && ( ns == LockState::Nothing || ( m_onlyContendedLocks && ns == LockState::HasLock ) ) )
@ -2362,8 +2363,10 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
}
const auto t2 = n == tl.end() ? GetLastTime() : (*n)->time;
const auto px2 = ( t2 - m_zvStart ) * pxns;
if( px2 - px0 > MinVisSize ) break;
if( px2 - px0 > MinVisSize && !( ns == LockState::Nothing || ( m_onlyContendedLocks && ns == LockState::HasLock ) ) && drawState != ns ) break;
if( px2 - px1 > MinVisSize ) break;
t1 = t2;
tx0 = px1;
px1 = px2;
next = n;
nextState = ns;