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

Don't calculate queue delay if delayed init is used.

Browse Source 
Queue calibration requires queue access during profiler construction. This
in turn requires construction of profiler data block, *which at this point
is underway*, because the profiler is being constructed.
This commit is contained in:
Bartosz Taudul 2019-06-19 17:29:04 +02:00
parent c98f1f0b6b
commit 351e220d30
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/TracyProfiler.cpp
View File

@ -2375,6 +2375,20 @@ void Profiler::CalibrateTimer()
void Profiler::CalibrateDelay() void Profiler::CalibrateDelay()
{ {
enum { Iterations = 50000 }; enum { Iterations = 50000 };
auto mindiff = std::numeric_limits<int64_t>::max();
for( int i=0; i<Iterations * 10; i++ )
{
const auto t0i = GetTime();
const auto t1i = GetTime();
const auto dti = t1i - t0i;
if( dti > 0 && dti < mindiff ) mindiff = dti;
}
m_resolution = mindiff;
#ifdef TRACY_DELAYED_INIT
m_delay = m_resolution;
#else
enum { Events = Iterations * 2 }; // start + end enum { Events = Iterations * 2 }; // start + end
static_assert( Events < QueuePrealloc, "Delay calibration loop will allocate memory in queue" ); static_assert( Events < QueuePrealloc, "Delay calibration loop will allocate memory in queue" );
@ -2406,17 +2420,6 @@ void Profiler::CalibrateDelay()
const auto dt = t1 - t0; const auto dt = t1 - t0;
m_delay = dt / Events; m_delay = dt / Events;
auto mindiff = std::numeric_limits<int64_t>::max();
for( int i=0; i<Iterations * 10; i++ )
{
const auto t0i = GetTime();
const auto t1i = GetTime();
const auto dti = t1i - t0i;
if( dti > 0 && dti < mindiff ) mindiff = dti;
}
m_resolution = mindiff;
enum { Bulk = 1000 }; enum { Bulk = 1000 };
moodycamel::ConsumerToken token( GetQueue() ); moodycamel::ConsumerToken token( GetQueue() );
int left = Events; int left = Events;
@ -2428,6 +2431,7 @@ void Profiler::CalibrateDelay()
left -= (int)sz; left -= (int)sz;
} }
assert( GetQueue().size_approx() == 0 ); assert( GetQueue().size_approx() == 0 );
#endif
} }
void Profiler::SendCallstack( int depth, const char* skipBefore ) void Profiler::SendCallstack( int depth, const char* skipBefore )