diff options
Diffstat (limited to 'indra/llcommon/lltrace.h')
| -rw-r--r-- | indra/llcommon/lltrace.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h index 0f927bad53..8c3259eea9 100644 --- a/indra/llcommon/lltrace.h +++ b/indra/llcommon/lltrace.h @@ -243,8 +243,6 @@ namespace LLTrace : public LLInstanceTracker<TraceType<ACCUMULATOR>, std::string> { public: - typedef typename MeanValueType<TraceType<ACCUMULATOR> >::type mean_t; - TraceType(const char* name, const char* description = NULL) : LLInstanceTracker<TraceType<ACCUMULATOR>, std::string>(name), mName(name), @@ -446,8 +444,10 @@ namespace LLTrace // // members // - U64 mChildTimeCounter, - mTotalTimeCounter; + U64 mStartChildTimeCounter, + mStartSelfTimeCounter, + mChildTimeCounter, + mSelfTimeCounter; U32 mCalls; class TimeBlock* mParent; // last acknowledged parent of this time block class TimeBlock* mLastCaller; // used to bootstrap tree construction @@ -468,7 +468,6 @@ namespace LLTrace : public TraceType<TimeBlockAccumulator> { public: - typedef F32 mean_t; TraceType(const char* name, const char* description = "") : TraceType<TimeBlockAccumulator>(name, description) @@ -476,17 +475,30 @@ namespace LLTrace }; template<> + struct MeanValueType<TraceType<TimeBlockAccumulator::CallCountAspect> > + { + typedef F64 type; + }; + + + template<> class TraceType<TimeBlockAccumulator::SelfTimeAspect> : public TraceType<TimeBlockAccumulator> { public: - typedef F32 mean_t; TraceType(const char* name, const char* description = "") : TraceType<TimeBlockAccumulator>(name, description) {} }; + template<> + struct MeanValueType<TraceType<TimeBlockAccumulator::SelfTimeAspect> > + { + typedef LLUnit<LLUnits::Seconds, F64> type; + }; + + class TimeBlock; class TimeBlockTreeNode { |