diff options
| author | Richard Linden <none@none> | 2012-12-21 00:13:21 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-12-21 00:13:21 -0800 |
| commit | 013f04cabec8e110ee659d9b3f75a4d25f114b7b (patch) | |
| tree | 2ce361819f7e5031a9b079c8d13c8d6895e50a3d /indra/llcommon/lltracerecording.h | |
| parent | c219282f5de753a044cecb53bd806145f68add9a (diff) | |
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
Diffstat (limited to 'indra/llcommon/lltracerecording.h')
| -rw-r--r-- | indra/llcommon/lltracerecording.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h index 8e5f1125ec..f2d7d42211 100644 --- a/indra/llcommon/lltracerecording.h +++ b/indra/llcommon/lltracerecording.h @@ -114,8 +114,12 @@ namespace LLTrace void makeUnique(); + // accumulate data from subsequent, non-overlapping recording void appendRecording(const Recording& other); + // gather data from recording, ignoring time relationship (for example, pulling data from slave threads) + void mergeRecording(const Recording& other); + void update(); // Timer accessors |