diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-29 10:03:33 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-29 10:03:33 -0500 |
| commit | 28b628ab7b92243a6e40fcdf87f4e2c5b44150e7 (patch) | |
| tree | 1e15e9602d8dcfc5766587114d822623a14d6a29 /indra/llcommon/llfasttimer_class.h | |
| parent | 261ac32dda439fa1fc5708c78168967bf4d484e6 (diff) | |
allow run-time query of which timer function is being used
Diffstat (limited to 'indra/llcommon/llfasttimer_class.h')
| -rwxr-xr-x | indra/llcommon/llfasttimer_class.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llfasttimer_class.h b/indra/llcommon/llfasttimer_class.h index 038a2d246a..827747f0c6 100755 --- a/indra/llcommon/llfasttimer_class.h +++ b/indra/llcommon/llfasttimer_class.h @@ -180,8 +180,10 @@ public: sTimerCycles += timer_end - timer_start; #endif #if DEBUG_FAST_TIMER_THREADS +#if !LL_RELEASE assert_main_thread(); #endif +#endif } LL_FORCE_INLINE ~LLFastTimer() @@ -251,6 +253,7 @@ public: U32 mChildTime; }; static CurTimerData sCurTimerData; + static std::string sClockType; private: static U32 getCPUClockCount32(); |