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

Last time is stored in worker.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-01-08 15:44:29 +01:00
parent 9c6d037859
commit cb50cf9de6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/TracyView.cpp
View File

@ -2716,7 +2716,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
auto next = GetNextLockFunc( vbegin, vend, state, threadBit ); auto next = GetNextLockFunc( vbegin, vend, state, threadBit );
const auto t0 = (*vbegin)->time; const auto t0 = (*vbegin)->time;
int64_t t1 = next == tl.end() ? m_lastTime : (*next)->time; int64_t t1 = next == tl.end() ? m_worker.GetLastTime() : (*next)->time;
const auto px0 = std::max( pxend, ( t0 - m_zvStart ) * pxns ); const auto px0 = std::max( pxend, ( t0 - m_zvStart ) * pxns );
auto tx0 = px0; auto tx0 = px0;
double px1 = ( t1 - m_zvStart ) * pxns; double px1 = ( t1 - m_zvStart ) * pxns;
@ -2738,7 +2738,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
} }
drawState = CombineLockState( drawState, state ); drawState = CombineLockState( drawState, state );
condensed++; condensed++;
const auto t2 = n == tl.end() ? m_lastTime : (*n)->time; const auto t2 = n == tl.end() ? m_worker.GetLastTime() : (*n)->time;
const auto px2 = ( t2 - m_zvStart ) * pxns; const auto px2 = ( t2 - m_zvStart ) * pxns;
if( px2 - px1 > MinVisSize ) break; if( px2 - px1 > MinVisSize ) break;
if( drawState != ns && px2 - px0 > MinVisSize && !( ns == LockState::Nothing || ( m_onlyContendedLocks && ns == LockState::HasLock ) ) ) break; if( drawState != ns && px2 - px0 > MinVisSize && !( ns == LockState::Nothing || ( m_onlyContendedLocks && ns == LockState::HasLock ) ) ) break;

1
server/TracyView.hpp
View File

@ -216,7 +216,6 @@ private:
int64_t m_zvStart = 0; int64_t m_zvStart = 0;
int64_t m_zvEnd = 0; int64_t m_zvEnd = 0;
int64_t m_lastTime;
int8_t m_lastCpu; int8_t m_lastCpu;