From dbe9742703cf14db85ec3d16c540efc68dce95a6 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 2 Oct 2012 15:37:16 -0700
Subject: SH-3404  create sampler class renamed LLTrace::ThreadTrace to
 LLTrace::ThreadRecorder renamed LLTrace::Sampler to LLTrace::Recording

---
 indra/newview/llappviewer.cpp         | 2 +-
 indra/newview/llviewerstats.cpp       | 3 +--
 indra/newview/llviewerstats.h         | 7 ++++---
 indra/newview/llviewertexturelist.cpp | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0bb87dfa6c..22f3cce9e8 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1222,7 +1222,7 @@ bool LLAppViewer::mainLoop()
 	{
 		LLFastTimer _(FTM_FRAME);
 		LLFastTimer::nextFrame(); 
-		LLTrace::getMasterThreadTrace().pullFromSlaveThreads();
+		LLTrace::getMasterThreadRecorder().pullFromSlaveThreads();
 
 		//clear call stack records
 		llclearcallstacks;
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index e2b09a1902..a6e9643edd 100755
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -276,12 +276,11 @@ LLViewerStats::LLViewerStats() :
 	}	
 	
 	mAgentPositionSnaps.reset();
-	mSampler->start();
+	mRecording.start();
 }
 
 LLViewerStats::~LLViewerStats()
 {
-	delete mSampler;
 }
 
 void LLViewerStats::resetStats()
diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h
index 9e809dd08c..ca5f6c6821 100755
--- a/indra/newview/llviewerstats.h
+++ b/indra/newview/llviewerstats.h
@@ -29,7 +29,8 @@
 
 #include "llstat.h"
 #include "lltextureinfo.h"
-#include "lltracesampler.h"
+#include "lltracerecording.h"
+#include "lltrace.h"
 
 extern LLTrace::Rate<F32>	STAT_KBIT,
 							STAT_LAYERS_KBIT,
@@ -297,11 +298,11 @@ public:
 		static void recordPhaseStat(const std::string& phase_name, F32 value);
 	};
 
-	LLTrace::Sampler* getSampler() { return mSampler; }
+	LLTrace::Recording& getRecording() { return mRecording; }
 
 private:
 	F64	mStats[ST_COUNT];
-	LLTrace::Sampler*	mSampler;
+	LLTrace::Recording	mRecording;
 
 	F64 mLastTimeDiff;  // used for time stat updates
 };
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 21a83b1676..4e62cbd714 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -622,9 +622,9 @@ void LLViewerTextureList::updateImages(F32 max_time)
 	}
 	cleared = FALSE;
 
-	LLTrace::Sampler* sampler = LLTrace::getThreadTrace()->getPrimarySampler();
+	LLTrace::Recording* recording = LLTrace::get_thread_recorder()->getPrimaryRecording();
 
-	LLAppViewer::getTextureFetch()->setTextureBandwidth(sampler->getMean(STAT_TEXTURE_KBIT) / sampler->getSampleTime());
+	LLAppViewer::getTextureFetch()->setTextureBandwidth(recording->getPerSec(STAT_TEXTURE_KBIT));
 
 	LLViewerStats::getInstance()->mNumImagesStat.addValue(sNumImages);
 	LLViewerStats::getInstance()->mNumRawImagesStat.addValue(LLImageRaw::sRawImageCount);
-- 
cgit v1.2.3