summaryrefslogtreecommitdiff
path: root/indra/llcommon/lltrace.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcommon/lltrace.h')
-rw-r--r--indra/llcommon/lltrace.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h
index c5356777ae..39de79e4c1 100644
--- a/indra/llcommon/lltrace.h
+++ b/indra/llcommon/lltrace.h
@@ -497,9 +497,19 @@ namespace LLTrace
Recording* getPrimaryRecording();
protected:
- Recording mPrimaryRecording;
+ struct ActiveRecording
+ {
+ ActiveRecording(Recording* source, Recording* target);
+
+ Recording* mTargetRecording;
+ Recording mBaseline;
+
+ void mergeMeasurements(ActiveRecording& other);
+ void flushAccumulators(Recording* current);
+ };
+ Recording* mPrimaryRecording;
Recording mFullRecording;
- std::list<Recording*> mActiveRecordings;
+ std::list<ActiveRecording> mActiveRecordings;
};
class LL_COMMON_API MasterThreadRecorder : public ThreadRecorder