diff options
| -rw-r--r-- | indra/llcommon/lltrace.h | 5 | ||||
| -rw-r--r-- | indra/llcommon/lltracerecording.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h index 376248c87a..d1edaf969b 100644 --- a/indra/llcommon/lltrace.h +++ b/indra/llcommon/lltrace.h @@ -264,6 +264,7 @@ class MeasurementAccumulator { public: typedef T value_t; + typedef F64 mean_t; typedef MeasurementAccumulator<T> self_t; MeasurementAccumulator() @@ -380,6 +381,7 @@ class CountAccumulator public: typedef CountAccumulator<T> self_t; typedef T value_t; + typedef F64 mean_t; CountAccumulator() : mSum(0), @@ -418,17 +420,20 @@ class TimeBlockAccumulator { public: typedef LLUnit<LLUnits::Seconds, F64> value_t; + typedef LLUnit<LLUnits::Seconds, F64> mean_t; typedef TimeBlockAccumulator self_t; // fake class that allows us to view call count aspect of timeblock accumulator struct CallCountAspect { typedef U32 value_t; + typedef F32 mean_t; }; struct SelfTimeAspect { typedef LLUnit<LLUnits::Seconds, F64> value_t; + typedef LLUnit<LLUnits::Seconds, F64> mean_t; }; TimeBlockAccumulator(); diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h index 1412d78a56..14018bc48f 100644 --- a/indra/llcommon/lltracerecording.h +++ b/indra/llcommon/lltracerecording.h @@ -362,7 +362,7 @@ namespace LLTrace size_t total_periods = mRecordingPeriods.size(); num_periods = llmin(num_periods, total_periods); - typename T::value_t mean = 0.0; + typename T::value_t mean = T::value_t(); if (num_periods <= 0) { return mean; } for (S32 i = 1; i <= num_periods; i++) @@ -383,7 +383,7 @@ namespace LLTrace size_t total_periods = mRecordingPeriods.size(); num_periods = llmin(num_periods, total_periods); - typename T::value_t mean = 0.0; + typename T::value_t mean = T::value_t(); if (num_periods <= 0) { return mean; } for (S32 i = 1; i <= num_periods; i++) |