From 05510799e5a69eafcc919e72d25cf5b89c9274cf Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 9 Oct 2012 22:18:07 -0700
Subject: SH-3275 WIP Update viewer metrics system to be more flexible renamed
mergeSamples to mergeRecording
---
indra/llcommon/lltracerecording.cpp | 2 +-
indra/llcommon/lltracerecording.h | 4 ++--
indra/llcommon/lltracethreadrecorder.cpp | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index d931c4ed29..9a08770bd7 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -97,7 +97,7 @@ bool Recording::isPrimary()
return mRates->isPrimary();
}
-void Recording::mergeSamples( const Recording& other )
+void Recording::mergeRecording( const Recording& other )
{
mRates.write()->mergeSamples(*other.mRates);
mMeasurements.write()->mergeSamples(*other.mMeasurements);
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h
index 092dc7ff2c..4399a65cfb 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -194,7 +194,7 @@ namespace LLTrace
void makePrimary();
bool isPrimary();
- void mergeSamples(const Recording& other);
+ void mergeRecording(const Recording& other);
void mergeDeltas(const Recording& baseline, const Recording& target);
void reset();
@@ -300,7 +300,7 @@ namespace LLTrace
mTotalRecording.reset();
for (S32 i = (mCurPeriod + 1) % mNumPeriods; i < mCurPeriod; i++)
{
- mTotalRecording.mergeSamples(mRecordingPeriods[i]);
+ mTotalRecording.mergeRecording(mRecordingPeriods[i]);
}
}
mTotalValid = true;
diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index b2c6fe3b80..4d020f5650 100644
--- a/indra/llcommon/lltracethreadrecorder.cpp
+++ b/indra/llcommon/lltracethreadrecorder.cpp
@@ -161,13 +161,13 @@ void SlaveThreadRecorder::pushToMaster()
void SlaveThreadRecorder::SharedData::copyFrom( const Recording& source )
{
LLMutexLock lock(&mRecorderMutex);
- mRecorder.mergeSamples(source);
+ mRecorder.mergeRecording(source);
}
void SlaveThreadRecorder::SharedData::copyTo( Recording& sink )
{
LLMutexLock lock(&mRecorderMutex);
- sink.mergeSamples(mRecorder);
+ sink.mergeRecording(mRecorder);
}
///////////////////////////////////////////////////////////////////////
--
cgit v1.2.3