diff options
| author | Richard Linden <none@none> | 2012-12-02 23:00:36 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-12-02 23:00:36 -0800 |
| commit | 13e4edf1cd664864afa585bc83bbe99d4f743326 (patch) | |
| tree | 52d6b16185099b58bcf7d284d753d938ecced027 /indra/llcommon/llfasttimer.cpp | |
| parent | 4f9a5d0554c16a81625574a7a4ad6d5070e649e3 (diff) | |
SH-3406 WIP convert fast timers to lltrace system
started moving fast timer historical stats over to LLTrace periodic
recording
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rw-r--r-- | indra/llcommon/llfasttimer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index 19676cc0c6..e33cb76eff 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -133,12 +133,12 @@ void BlockTimer::setLogLock(LLMutex* lock) //static #if (LL_DARWIN || LL_LINUX || LL_SOLARIS) && !(defined(__i386__) || defined(__amd64__)) -U64 BlockTimer::countsPerSecond() // counts per second for the *32-bit* timer +U64 BlockTimer::countsPerSecond() // counts per second for the *64-bit* timer { - return sClockResolution >> 8; + return sClockResolution; } #else // windows or x86-mac or x86-linux or x86-solaris -U64 BlockTimer::countsPerSecond() // counts per second for the *32-bit* timer +U64 BlockTimer::countsPerSecond() // counts per second for the *64-bit* timer { #if LL_FASTTIMER_USE_RDTSC || !LL_WINDOWS //getCPUFrequency returns MHz and sCPUClockFrequency wants to be in Hz |