diff options
| author | Richard Linden <none@none> | 2012-12-01 00:17:04 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-12-01 00:17:04 -0800 |
| commit | ca2207bd35c33b13b122f875a5a7d218f94ca3fc (patch) | |
| tree | ee3b8dcfabfb9f8239dd5b2b677c52f731b999df /indra/newview/llappviewer.cpp | |
| parent | ca37317a1473bb79ef8de4f683231700cb9e062c (diff) | |
SH-3406 WIP convert fast timers to lltrace system
fixed scale of reported times
moved reset calls to happen at same time so we don't show partial results
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index fb95c9ec5b..b9bdb7cd08 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1235,6 +1235,8 @@ bool LLAppViewer::mainLoop() { LLFastTimer _(FTM_FRAME); LLTrace::BlockTimer::nextFrame(); + LLTrace::get_frame_recording().nextPeriod(); + LLTrace::getMasterThreadRecorder().pullFromSlaveThreads(); //clear call stack records @@ -1352,8 +1354,6 @@ bool LLAppViewer::mainLoop() LLFloaterSnapshot::update(); // take snapshots gGLActive = FALSE; } - - LLTrace::get_frame_recording().nextPeriod(); } pingMainloopTimeout("Main:Sleep"); |