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

renamed LLView::handleVisibilityChange to onVisibilityChange to reflect
cleaned up scene monitor stats recording, now all trace stats dumped to csv
also fixed extendablerecording, periodicrecording, etc. to properly implement start/stop/etc

2 files changed, 111 insertions, 190 deletions

diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index e562f2bce2..6b5c6c7d3e 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -179,8 +179,6 @@ void Recording::handleStop()
 
 void Recording::handleSplitTo(Recording& other)
 {
-	stop();
-	other.restart();
 	handOffTo(other);
 }
 
@@ -375,94 +373,86 @@ PeriodicRecording::PeriodicRecording( U32 num_periods, EPlayState state)
 
 void PeriodicRecording::nextPeriod()
 {
-	EPlayState play_state = getPlayState();
-	Recording& old_recording = getCurRecording();
 	if (mAutoResize)
 	{
 		mRecordingPeriods.push_back(Recording());
 	}
-	U32 num_periods = mRecordingPeriods.size();
-	mCurPeriod = (num_periods > 0) 
-				? (mCurPeriod + 1) % num_periods 
-				: mCurPeriod + 1;
-	old_recording.splitTo(getCurRecording());
 
-	switch(play_state)
-	{
-	case STOPPED:
-		getCurRecording().stop();
-		break;
-	case PAUSED:
-		getCurRecording().pause();
-		break;
-	case STARTED:
-		break;
-	}
+	Recording& old_recording = getCurRecording();
+
+	mCurPeriod = mRecordingPeriods.empty()
+				? mCurPeriod + 1
+				: (mCurPeriod + 1) % mRecordingPeriods.size();
+	old_recording.splitTo(getCurRecording());
 }
 
 
 void PeriodicRecording::appendPeriodicRecording( PeriodicRecording& other )
 {
-	if (other.mRecordingPeriods.size() < 2) return;
+	if (other.mRecordingPeriods.empty()) return;
 
 	EPlayState play_state = getPlayState();
-	pause();
+	stop();
 
 	EPlayState other_play_state = other.getPlayState();
 	other.pause();
 
-	if (mAutoResize)
-	{
-		// copy everything after current period of other recording to end of buffer
-		// this will only apply if other recording is using a fixed circular buffer
-		if (other.mCurPeriod < other.mRecordingPeriods.size() - 1)
-		{
-			std::copy(	other.mRecordingPeriods.begin() + other.mCurPeriod + 1,
-						other.mRecordingPeriods.end(),
-						std::back_inserter(mRecordingPeriods));
-		}
+	U32 other_recording_count = other.mRecordingPeriods.size();
 
-		// copy everything from beginning of other recording's buffer up to, but not including
-		// current period
-		std::copy(	other.mRecordingPeriods.begin(),
-					other.mRecordingPeriods.begin() + other.mCurPeriod,
-					std::back_inserter(mRecordingPeriods));
+	Recording& other_oldest_recording = other.mRecordingPeriods[(other.mCurPeriod + 1) % other.mRecordingPeriods.size()];
 
-		mCurPeriod = mRecordingPeriods.size() - 1;
+	// if I have a recording of any length, then close it off and start a fresh one
+	if (getCurRecording().getDuration().value())
+	{
+		nextPeriod();
 	}
-	else
+	getCurRecording().appendRecording(other_oldest_recording);
+
+	if (other_recording_count > 1)
 	{
-		size_t num_to_copy = llmin(	mRecordingPeriods.size(), other.mRecordingPeriods.size() );
-		std::vector<Recording>::iterator src_it = other.mRecordingPeriods.begin() 
-													+ (	(other.mCurPeriod + 1)									// cur period
-															+ (other.mRecordingPeriods.size() - num_to_copy)	// minus room for copy
-														% other.mRecordingPeriods.size());
-		std::vector<Recording>::iterator dest_it = mRecordingPeriods.begin() + ((mCurPeriod + 1) % mRecordingPeriods.size());
-
-		for(S32 i = 0; i < num_to_copy; i++)
+		if (mAutoResize)
 		{
-			*dest_it = *src_it;
-
-			if (++src_it == other.mRecordingPeriods.end())
+			for (S32 other_index = (other.mCurPeriod + 2) % other_recording_count; 
+				other_index != other.mCurPeriod; 
+				other_index = (other_index + 1) % other_recording_count)
 			{
-				src_it = other.mRecordingPeriods.begin();
+				llassert(other.mRecordingPeriods[other_index].getDuration() != 0.f 
+							&& (mRecordingPeriods.empty() 
+								|| other.mRecordingPeriods[other_index].getDuration() != mRecordingPeriods.back().getDuration()));
+				mRecordingPeriods.push_back(other.mRecordingPeriods[other_index]);
 			}
 
-			if (++dest_it == mRecordingPeriods.end())
+			mCurPeriod = mRecordingPeriods.size() - 1;
+		}
+		else
+		{
+			size_t num_to_copy = llmin(	mRecordingPeriods.size(), other.mRecordingPeriods.size() - 1);
+			std::vector<Recording>::iterator src_it = other.mRecordingPeriods.begin() 
+														+ (	(other.mCurPeriod + 1									// oldest period
+																+ (other.mRecordingPeriods.size() - num_to_copy))	// minus room for copy
+															% other.mRecordingPeriods.size());
+			std::vector<Recording>::iterator dest_it = mRecordingPeriods.begin() + ((mCurPeriod + 1) % mRecordingPeriods.size());
+
+			for(S32 i = 0; i < num_to_copy; i++)
 			{
-				dest_it = mRecordingPeriods.begin();
+				*dest_it = *src_it;
+
+				if (++src_it == other.mRecordingPeriods.end())
+				{
+					src_it = other.mRecordingPeriods.begin();
+				}
+
+				if (++dest_it == mRecordingPeriods.end())
+				{
+					dest_it = mRecordingPeriods.begin();
+				}
 			}
-		}
 		
-		mCurPeriod = (mCurPeriod + num_to_copy) % mRecordingPeriods.size();
+			mCurPeriod = (mCurPeriod + num_to_copy) % mRecordingPeriods.size();
+		}
 	}
 
-	// if copying from periodic recording that wasn't active advance our period to the next available one
-	// otherwise continue recording on top of the last period of data received from the other recording
-	if (other_play_state != STARTED)
-	{
-		nextPeriod();
-	}
+	nextPeriod();
 
 	setPlayState(play_state);
 	other.setPlayState(other_play_state);
@@ -524,47 +514,28 @@ const Recording& PeriodicRecording::getPrevRecording( U32 offset ) const
 	return mRecordingPeriods[(mCurPeriod + num_periods - offset) % num_periods];
 }
 
-void PeriodicRecording::start()
+void PeriodicRecording::handleStart()
 {
 	getCurRecording().start();
 }
 
-void PeriodicRecording::stop()
-{
-	getCurRecording().stop();
-}
-
-void PeriodicRecording::pause()
+void PeriodicRecording::handleStop()
 {
 	getCurRecording().pause();
 }
 
-void PeriodicRecording::resume()
-{
-	getCurRecording().resume();
-}
-
-void PeriodicRecording::restart()
+void PeriodicRecording::handleReset()
 {
-	getCurRecording().restart();
+	mRecordingPeriods.clear();
+	mRecordingPeriods.push_back(Recording());
+	mCurPeriod = 0;
 }
 
-void PeriodicRecording::reset()
+void PeriodicRecording::handleSplitTo(PeriodicRecording& other)
 {
-	getCurRecording().reset();
+	getCurRecording().handOffTo(other.getCurRecording());
 }
 
-void PeriodicRecording::splitTo(PeriodicRecording& other)
-{
-	getCurRecording().splitTo(other.getCurRecording());
-}
-
-void PeriodicRecording::splitFrom(PeriodicRecording& other)
-{
-	getCurRecording().splitFrom(other.getCurRecording());
-}
-
-
 ///////////////////////////////////////////////////////////////////////
 // ExtendableRecording
 ///////////////////////////////////////////////////////////////////////
@@ -581,55 +552,27 @@ void ExtendableRecording::extend()
 	mPotentialRecording.setPlayState(getPlayState());
 }
 
-void ExtendableRecording::start()
+void ExtendableRecording::handleStart()
 {
-	LLStopWatchControlsMixin<ExtendableRecording>::start();
 	mPotentialRecording.start();
 }
 
-void ExtendableRecording::stop()
-{
-	LLStopWatchControlsMixin<ExtendableRecording>::stop();
-	mPotentialRecording.stop();
-}
-
-void ExtendableRecording::pause()
+void ExtendableRecording::handleStop()
 {
-	LLStopWatchControlsMixin<ExtendableRecording>::pause();
 	mPotentialRecording.pause();
 }
 
-void ExtendableRecording::resume()
-{
-	LLStopWatchControlsMixin<ExtendableRecording>::resume();
-	mPotentialRecording.resume();
-}
-
-void ExtendableRecording::restart()
-{
-	LLStopWatchControlsMixin<ExtendableRecording>::restart();
-	mAcceptedRecording.reset();
-	mPotentialRecording.restart();
-}
-
-void ExtendableRecording::reset()
+void ExtendableRecording::handleReset()
 {
-	LLStopWatchControlsMixin<ExtendableRecording>::reset();
 	mAcceptedRecording.reset();
 	mPotentialRecording.reset();
 }
 
-void ExtendableRecording::splitTo(ExtendableRecording& other)
+void ExtendableRecording::handleSplitTo(ExtendableRecording& other)
 {
-	LLStopWatchControlsMixin<ExtendableRecording>::splitTo(other);
-	mPotentialRecording.splitTo(other.mPotentialRecording);
+	mPotentialRecording.handOffTo(other.mPotentialRecording);
 }
 
-void ExtendableRecording::splitFrom(ExtendableRecording& other)
-{
-	LLStopWatchControlsMixin<ExtendableRecording>::splitFrom(other);
-	mPotentialRecording.splitFrom(other.mPotentialRecording);
-}
 
 ///////////////////////////////////////////////////////////////////////
 // ExtendablePeriodicRecording
@@ -639,13 +582,13 @@ void ExtendableRecording::splitFrom(ExtendableRecording& other)
 ExtendablePeriodicRecording::ExtendablePeriodicRecording() 
 :	mAcceptedRecording(0), 
 	mPotentialRecording(0)
-{
-}
+{}
 
 void ExtendablePeriodicRecording::extend()
 {
+	llassert(mPotentialRecording.getPlayState() == getPlayState());
 	// stop recording to get latest data
-	mPotentialRecording.stop();
+	mPotentialRecording.pause();
 	// push the data back to accepted recording
 	mAcceptedRecording.appendPeriodicRecording(mPotentialRecording);
 	// flush data, so we can start from scratch
@@ -654,55 +597,28 @@ void ExtendablePeriodicRecording::extend()
 	mPotentialRecording.setPlayState(getPlayState());
 }
 
-void ExtendablePeriodicRecording::start()
-{
-	LLStopWatchControlsMixin<ExtendablePeriodicRecording>::start();
-	mPotentialRecording.start();
-}
 
-void ExtendablePeriodicRecording::stop()
+void ExtendablePeriodicRecording::handleStart()
 {
-	LLStopWatchControlsMixin<ExtendablePeriodicRecording>::stop();
-	mPotentialRecording.stop();
+	mPotentialRecording.start();
 }
 
-void ExtendablePeriodicRecording::pause()
+void ExtendablePeriodicRecording::handleStop()
 {
-	LLStopWatchControlsMixin<ExtendablePeriodicRecording>::pause();
 	mPotentialRecording.pause();
 }
 
-void ExtendablePeriodicRecording::resume()
-{
-	LLStopWatchControlsMixin<ExtendablePeriodicRecording>::resume();
-	mPotentialRecording.resume();
-}
-
-void ExtendablePeriodicRecording::restart()
-{
-	LLStopWatchControlsMixin<ExtendablePeriodicRecording>::restart();
-	mAcceptedRecording.reset();
-	mPotentialRecording.restart();
-}
-
-void ExtendablePeriodicRecording::reset()
+void ExtendablePeriodicRecording::handleReset()
 {
-	LLStopWatchControlsMixin<ExtendablePeriodicRecording>::reset();
 	mAcceptedRecording.reset();
 	mPotentialRecording.reset();
 }
 
-void ExtendablePeriodicRecording::splitTo(ExtendablePeriodicRecording& other)
+void ExtendablePeriodicRecording::handleSplitTo(ExtendablePeriodicRecording& other)
 {
-	LLStopWatchControlsMixin<ExtendablePeriodicRecording>::splitTo(other);
 	mPotentialRecording.splitTo(other.mPotentialRecording);
 }
 
-void ExtendablePeriodicRecording::splitFrom(ExtendablePeriodicRecording& other)
-{
-	LLStopWatchControlsMixin<ExtendablePeriodicRecording>::splitFrom(other);
-	mPotentialRecording.splitFrom(other.mPotentialRecording);
-}
 
 PeriodicRecording& get_frame_recording()
 {
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h
index 84006a10b8..be8618a299 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -46,12 +46,12 @@ public:
 		STARTED
 	};
 
-	virtual void start();
-	virtual void stop();
-	virtual void pause();
-	virtual void resume();
-	virtual void restart();
-	virtual void reset();
+	void start();
+	void stop();
+	void pause();
+	void resume();
+	void restart();
+	void reset();
 
 	bool isStarted() const { return mPlayState == STARTED; }
 	bool isPaused() const  { return mPlayState == PAUSED; }
@@ -67,11 +67,11 @@ protected:
 
 private:
 	// trigger active behavior (without reset)
-	virtual void handleStart(){};
+	virtual void handleStart() = 0;
 	// stop active behavior
-	virtual void handleStop(){};
+	virtual void handleStop() = 0;
 	// clear accumulated state, can be called while started
-	virtual void handleReset(){};
+	virtual void handleReset() = 0;
 
 	EPlayState mPlayState;
 };
@@ -84,7 +84,13 @@ public:
 	typedef LLStopWatchControlsMixin<DERIVED> self_t;
 	virtual void splitTo(DERIVED& other)
 	{
+		EPlayState play_state = getPlayState();
+		stop();
+		other.reset();
+
 		handleSplitTo(other);
+
+		other.setPlayState(play_state);
 	}
 
 	virtual void splitFrom(DERIVED& other)
@@ -124,7 +130,9 @@ namespace LLTrace
 		LLCopyOnWritePointer<AccumulatorBuffer<MemStatAccumulator> >			mMemStats;
 	};
 
-	class Recording : public LLStopWatchControlsMixin<Recording>, public RecordingBuffers
+	class Recording 
+	:	public LLStopWatchControlsMixin<Recording>, 
+		public RecordingBuffers
 	{
 	public:
 		Recording();
@@ -367,15 +375,12 @@ namespace LLTrace
 			return mean;
 		}
 
+	private:
 		// implementation for LLStopWatchControlsMixin
-		/*virtual*/ void start();
-		/*virtual*/ void stop();
-		/*virtual*/ void pause();
-		/*virtual*/ void resume();
-		/*virtual*/ void restart();
-		/*virtual*/ void reset();
-		/*virtual*/ void splitTo(PeriodicRecording& other);
-		/*virtual*/ void splitFrom(PeriodicRecording& other);
+		/*virtual*/ void handleStart();
+		/*virtual*/ void handleStop();
+		/*virtual*/ void handleReset();
+		/*virtual*/ void handleSplitTo(PeriodicRecording& other);
 
 	private:
 		std::vector<Recording>	mRecordingPeriods;
@@ -395,15 +400,15 @@ namespace LLTrace
 		Recording& getAcceptedRecording() { return mAcceptedRecording; }
 		const Recording& getAcceptedRecording() const {return mAcceptedRecording;}
 
+		Recording& getPotentialRecording()				{ return mPotentialRecording; }
+		const Recording& getPotentialRecording() const	{ return mPotentialRecording;}
+
+	private:
 		// implementation for LLStopWatchControlsMixin
-		/*virtual*/ void start();
-		/*virtual*/ void stop();
-		/*virtual*/ void pause();
-		/*virtual*/ void resume();
-		/*virtual*/ void restart();
-		/*virtual*/ void reset();
-		/*virtual*/ void splitTo(ExtendableRecording& other);
-		/*virtual*/ void splitFrom(ExtendableRecording& other);
+		/*virtual*/ void handleStart();
+		/*virtual*/ void handleStop();
+		/*virtual*/ void handleReset();
+		/*virtual*/ void handleSplitTo(ExtendableRecording& other);
 
 	private:
 		Recording mAcceptedRecording;
@@ -419,16 +424,16 @@ namespace LLTrace
 
 		PeriodicRecording& getAcceptedRecording()				{ return mAcceptedRecording; }
 		const PeriodicRecording& getAcceptedRecording() const	{return mAcceptedRecording;}
+		
+		PeriodicRecording& getPotentialRecording()				{ return mPotentialRecording; }
+		const PeriodicRecording& getPotentialRecording() const	{return mPotentialRecording;}
 
+	private:
 		// implementation for LLStopWatchControlsMixin
-		/*virtual*/ void start();
-		/*virtual*/ void stop();
-		/*virtual*/ void pause();
-		/*virtual*/ void resume();
-		/*virtual*/ void restart();
-		/*virtual*/ void reset();
-		/*virtual*/ void splitTo(ExtendablePeriodicRecording& other);
-		/*virtual*/ void splitFrom(ExtendablePeriodicRecording& other);
+		/*virtual*/ void handleStart();
+		/*virtual*/ void handleStop();
+		/*virtual*/ void handleReset();
+		/*virtual*/ void handleSplitTo(ExtendablePeriodicRecording& other);
 
 	private:
 		PeriodicRecording mAcceptedRecording;