diff options
| author | Richard Linden <none@none> | 2012-12-18 20:07:25 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-12-18 20:07:25 -0800 |
| commit | c219282f5de753a044cecb53bd806145f68add9a (patch) | |
| tree | 9bea36fd9fba8f41fed4c04ba413bf5d41993ca0 /indra/llcommon/lltracerecording.h | |
| parent | 1f56e57008f5a50c9e75fc0b4512c483ac359a52 (diff) | |
SH-3406 WIP convert fast timers to lltrace system
removed some potential data races
got memory stats recording in trace system
Diffstat (limited to 'indra/llcommon/lltracerecording.h')
| -rw-r--r-- | indra/llcommon/lltracerecording.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h index f4841214e8..8e5f1125ec 100644 --- a/indra/llcommon/lltracerecording.h +++ b/indra/llcommon/lltracerecording.h @@ -34,7 +34,7 @@ #include "lltimer.h" #include "lltrace.h" -class LL_COMMON_API LLStopWatchControlsMixinCommon +class LLStopWatchControlsMixinCommon { public: virtual ~LLStopWatchControlsMixinCommon() {} @@ -101,7 +101,7 @@ private: namespace LLTrace { - class LL_COMMON_API Recording : public LLStopWatchControlsMixin<Recording> + class Recording : public LLStopWatchControlsMixin<Recording> { public: Recording(); @@ -127,6 +127,10 @@ namespace LLTrace LLUnit<LLUnits::Seconds, F64> getPerSec(const TraceType<TimeBlockAccumulator::SelfTimeAspect>& stat) const; F32 getPerSec(const TraceType<TimeBlockAccumulator::CallCountAspect>& stat) const; + // Memory accessors + LLUnit<LLUnits::Bytes, U32> getSum(const TraceType<MemStatAccumulator>& stat) const; + LLUnit<LLUnits::Bytes, F32> getPerSec(const TraceType<MemStatAccumulator>& stat) const; + // Count accessors F64 getSum(const TraceType<CountAccumulator<F64> >& stat) const; S64 getSum(const TraceType<CountAccumulator<S64> >& stat) const; @@ -226,7 +230,8 @@ namespace LLTrace LLCopyOnWritePointer<AccumulatorBuffer<MeasurementAccumulator<F64> > > mMeasurementsFloat; LLCopyOnWritePointer<AccumulatorBuffer<CountAccumulator<S64> > > mCounts; LLCopyOnWritePointer<AccumulatorBuffer<MeasurementAccumulator<S64> > > mMeasurements; - LLCopyOnWritePointer<AccumulatorBuffer<TimeBlockAccumulator> > mStackTimers; + LLCopyOnWritePointer<AccumulatorBuffer<TimeBlockAccumulator> > mStackTimers; + LLCopyOnWritePointer<AccumulatorBuffer<MemStatAccumulator> > mMemStats; LLTimer mSamplingTimer; F64 mElapsedSeconds; |