diff options
| author | Richard Linden <none@none> | 2012-11-27 20:19:10 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-27 20:19:10 -0800 |
| commit | 0e1283cf6d17514a9a32595fc29df38a4b4b2d3a (patch) | |
| tree | 807704238da011a85fd6dd06735c8c55829de98c | |
| parent | 1c894c05c10ef37be6507ee4bc4e9173506adfb6 (diff) | |
| parent | 93aca485ba08a82a6bd3a2fc31deca18af0d1478 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
| -rw-r--r-- | indra/llcommon/llfasttimer.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index 16dd21332c..e88a5a9ed1 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -269,8 +269,8 @@ void BlockTimer::buildHierarchy() if (timer.mParent == &BlockTimer::getRootTimer()) { if (timer.getPrimaryAccumulator().mLastCaller) - { - timer.setParent(timer.getPrimaryAccumulator().mLastCaller); + { + timer.setParent(timer.getPrimaryAccumulator().mLastCaller); } // no need to push up tree on first use, flag can be set spuriously timer.getPrimaryAccumulator().mMoveUpTree = false; @@ -392,7 +392,7 @@ void BlockTimer::resetFrame() } call_count++; - F64 iclock_freq = 1000.0 / countsPerSecond(); // good place to calculate clock frequency + F64 iclock_freq = 1000.0 / get_clock_count(); // good place to calculate clock frequency F64 total_time = 0; LLSD sd; @@ -514,7 +514,7 @@ std::vector<BlockTimer*>& BlockTimer::getChildren() //static void BlockTimer::nextFrame() { - BlockTimer::countsPerSecond(); // good place to calculate clock frequency + get_clock_count(); // good place to calculate clock frequency U64 frame_time = BlockTimer::getCPUClockCount64(); if ((frame_time - sLastFrameTime) >> 8 > 0xffffffff) { @@ -538,7 +538,7 @@ void Time::dumpCurTimes() // accumulate timings, etc. BlockTimer::processTimes(); - F64 clock_freq = (F64)BlockTimer::countsPerSecond(); + F64 clock_freq = (F64)get_clock_count(); F64 iclock_freq = 1000.0 / clock_freq; // clock_ticks -> milliseconds // walk over timers in depth order and output timings diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 839094fc47..713ae789a7 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1353,6 +1353,7 @@ bool LLAppViewer::mainLoop() gGLActive = FALSE; } + LLTrace::get_frame_recording().nextPeriod(); } pingMainloopTimeout("Main:Sleep"); @@ -4371,9 +4372,6 @@ void LLAppViewer::idle() update_statistics(); } - LLTrace::get_frame_recording().nextPeriod(); - - //////////////////////////////////////// // // Handle the regular UI idle callbacks as well as |