SH-3404 create sampler class

renamed LLTrace::ThreadTrace to LLTrace::ThreadRecorder
renamed LLTrace::Sampler to LLTrace::Recording

2 files changed, 14 insertions, 14 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);
 		}
 	}
 	
diff --git a/indra/llui/llstatgraph.cpp b/indra/llui/llstatgraph.cpp
index e0d7623999..aed9e4ec93 100644
--- a/indra/llui/llstatgraph.cpp
+++ b/indra/llui/llstatgraph.cpp
@@ -35,7 +35,7 @@
 #include "llstat.h"
 #include "llgl.h"
 #include "llglheaders.h"
-#include "lltracesampler.h"
+#include "lltracerecording.h"
 //#include "llviewercontrol.h"
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -85,15 +85,15 @@ void LLStatGraph::draw()
 	}
 	else if (mF32Statp)
 	{
-		LLTrace::Sampler* sampler = LLTrace::get_thread_trace()->getPrimarySampler();
+		LLTrace::Recording* recording = LLTrace::get_thread_recorder()->getPrimaryRecording();
 
 		if (mPerSec)
 		{
-			mValue = sampler->getSum(*mF32Statp) / sampler->getSampleTime();
+			mValue = recording->getSum(*mF32Statp) / recording->getSampleTime();
 		}
 		else
 		{
-			mValue = sampler->getSum(*mF32Statp);
+			mValue = recording->getSum(*mF32Statp);
 		}
 
 	}