SH-3468 WIP add memory tracking base class

improvements on lifetime of lltrace core data structures
tweaks to thread local pointer handling so that static constructors/destructors
can safely call functions that use lltrace

1 files changed, 10 insertions, 3 deletions

diff --git a/indra/llcommon/lltracethreadrecorder.h b/indra/llcommon/lltracethreadrecorder.h
index 102b980e44..d09527eced 100644
--- a/indra/llcommon/lltracethreadrecorder.h
+++ b/indra/llcommon/lltracethreadrecorder.h
@@ -50,6 +50,8 @@ namespace LLTrace
 
 		virtual void pushToMaster() = 0;
 
+		TimeBlockTreeNode* getTimeBlockTreeNode(S32 index);
+
 	protected:
 		struct ActiveRecording
 		{
@@ -64,7 +66,9 @@ namespace LLTrace
 		std::list<ActiveRecording>	mActiveRecordings;
 
 		struct CurTimerData*	mRootTimerData;
-		class BlockTimer*				mRootTimer;
+		class BlockTimer*		mRootTimer;
+		TimeBlockTreeNode*		mTimeBlockTreeNodes;
+		size_t					mNumTimeBlockTreeNodes;
 	};
 
 	class LL_COMMON_API MasterThreadRecorder : public ThreadRecorder
@@ -104,8 +108,11 @@ namespace LLTrace
 		class SharedData
 		{
 		public:
-			void copyFrom(const Recording& source);
-			void copyTo(Recording& sink);
+			void appendFrom(const Recording& source);
+			void appendTo(Recording& sink);
+			void mergeFrom(const Recording& source);
+			void mergeTo(Recording& sink);
+			void reset();
 		private:
 			LLMutex		mRecordingMutex;
 			Recording	mRecording;