diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-05-24 10:51:09 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-05-24 10:51:09 -0700 |
| commit | 3dfb4944ed916f9a251078a2614a854b9de0315d (patch) | |
| tree | 251a82d2511132632d12e36c8e8be0d7bf5b11cf /indra/llcommon/llfasttimer_class.h | |
| parent | 1a5b3b0a9091a72fd5e5fb395f7f0c97b0fd502c (diff) | |
| parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/llcommon/llfasttimer_class.h')
| -rw-r--r-- | indra/llcommon/llfasttimer_class.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llcommon/llfasttimer_class.h b/indra/llcommon/llfasttimer_class.h index eb9789682b..827747f0c6 100644 --- a/indra/llcommon/llfasttimer_class.h +++ b/indra/llcommon/llfasttimer_class.h @@ -31,12 +31,15 @@ #define FAST_TIMER_ON 1 #define TIME_FAST_TIMERS 0 +#define DEBUG_FAST_TIMER_THREADS 1 class LLMutex; #include <queue> #include "llsd.h" +LL_COMMON_API void assert_main_thread(); + class LL_COMMON_API LLFastTimer { public: @@ -176,6 +179,11 @@ public: U64 timer_end = getCPUClockCount64(); sTimerCycles += timer_end - timer_start; #endif +#if DEBUG_FAST_TIMER_THREADS +#if !LL_RELEASE + assert_main_thread(); +#endif +#endif } LL_FORCE_INLINE ~LLFastTimer() @@ -245,6 +253,7 @@ public: U32 mChildTime; }; static CurTimerData sCurTimerData; + static std::string sClockType; private: static U32 getCPUClockCount32(); |