SH-3931 WIP Interesting: Add graphs to visualize scene load metrics

reverted SlaveThreadRecorder update gating
moved processTimes() outside of Recording, so it is called only once per frame
refined sample merge logic so that multi-threaded samples do not stomp on linear history
of a stat

1 files changed, 7 insertions, 18 deletions

diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index 89b5df1f94..75c7cb2ff1 100644
--- a/indra/llcommon/lltracethreadrecorder.cpp
+++ b/indra/llcommon/lltracethreadrecorder.cpp
@@ -202,21 +202,14 @@ SlaveThreadRecorder::~SlaveThreadRecorder()
 	mMasterRecorder.removeSlaveThread(this);
 }
 
-bool SlaveThreadRecorder::pushToMaster()
+void SlaveThreadRecorder::pushToMaster()
 {
-	if (mPushCount != mMasterRecorder.getPullCount())
+	mThreadRecording.stop();
 	{
-		mThreadRecording.stop();
-		{
-			LLMutexLock(mMasterRecorder.getSlaveListMutex());
-			mSharedData.appendFrom(mThreadRecording);
-		}
-		mThreadRecording.start();
-
-		mPushCount = mMasterRecorder.getPullCount();
-		return true;
+		LLMutexLock(mMasterRecorder.getSlaveListMutex());
+		mSharedData.appendFrom(mThreadRecording);
 	}
-	return false;
+	mThreadRecording.start();
 }
 
 void SlaveThreadRecorder::SharedData::appendFrom( const Recording& source )
@@ -271,8 +264,6 @@ void MasterThreadRecorder::pullFromSlaveThreads()
 		(*it)->mSharedData.mergeTo(target_recording_buffers);
 		(*it)->mSharedData.reset();
 	}
-
-	mPullCount++;
 }
 
 void MasterThreadRecorder::addSlaveThread( class SlaveThreadRecorder* child )
@@ -298,10 +289,8 @@ void MasterThreadRecorder::removeSlaveThread( class SlaveThreadRecorder* child )
 	}
 }
 
-bool MasterThreadRecorder::pushToMaster()
-{
-	return false;
-}
+void MasterThreadRecorder::pushToMaster()
+{}
 
 MasterThreadRecorder::MasterThreadRecorder()
 {}