summaryrefslogtreecommitdiff
path: root/indra/llui/llstatbar.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-10-02 15:37:16 -0700
committerRichard Linden <none@none>2012-10-02 15:37:16 -0700
commitdbe9742703cf14db85ec3d16c540efc68dce95a6 (patch)
treee15c2814f98a4cbdcd9d281ce4762f2fca5a86a5 /indra/llui/llstatbar.cpp
parent14b1b0b2bb6bac5bc688cc4d14c33f1b680dd3b4 (diff)
SH-3404 create sampler class
renamed LLTrace::ThreadTrace to LLTrace::ThreadRecorder renamed LLTrace::Sampler to LLTrace::Recording
Diffstat (limited to 'indra/llui/llstatbar.cpp')
-rw-r--r--indra/llui/llstatbar.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index 1f8be3da62..bc9603804b 100644
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -36,7 +36,7 @@
#include "llstat.h"
#include "lluictrlfactory.h"
-#include "lltracesampler.h"
+#include "lltracerecording.h"
///////////////////////////////////////////////////////////////////////////////////
@@ -111,20 +111,20 @@ void LLStatBar::draw()
}
else if (mFloatStatp)
{
- LLTrace::Sampler* sampler = LLTrace::get_thread_trace()->getPrimarySampler();
+ LLTrace::Recording* recording = LLTrace::get_thread_recorder()->getPrimaryRecording();
if (mPerSec)
{
- current = sampler->getSum(*mFloatStatp) / sampler->getSampleTime();
- //min = sampler->getMin(*mFloatStatp) / sampler->getSampleTime();
- //max = sampler->getMax(*mFloatStatp) / sampler->getSampleTime();
- //mean = sampler->getMean(*mFloatStatp) / sampler->getSampleTime();
+ current = recording->getSum(*mFloatStatp) / recording->getSampleTime();
+ //min = recording->getMin(*mFloatStatp) / recording->getSampleTime();
+ //max = recording->getMax(*mFloatStatp) / recording->getSampleTime();
+ //mean = recording->getMean(*mFloatStatp) / recording->getSampleTime();
}
else
{
- current = sampler->getSum(*mFloatStatp);
- //min = sampler->getMin(*mFloatStatp);
- //max = sampler->getMax(*mFloatStatp);
- //mean = sampler->getMean(*mFloatStatp);
+ current = recording->getSum(*mFloatStatp);
+ //min = recording->getMin(*mFloatStatp);
+ //max = recording->getMax(*mFloatStatp);
+ //mean = recording->getMean(*mFloatStatp);
}
}