diff options
| author | Richard Linden <none@none> | 2012-09-24 18:56:01 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-09-24 18:56:01 -0700 |
| commit | adeeabfc13c91dc99a1ea1949cd2f820c4150995 (patch) | |
| tree | 641a7bcfe966c1994f1461a1672e7a5193023ff8 /indra/llcommon/lltrace.cpp | |
| parent | 735fde8c742188d019e41faf26ff67aab6a24d25 (diff) | |
SH-3275 WIP Run viewer metrics for object update messages
moved LLThreadLocalPtr to llapr
fixed various startup race conditions for LLThreadLocalPtr
Diffstat (limited to 'indra/llcommon/lltrace.cpp')
| -rw-r--r-- | indra/llcommon/lltrace.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp index 037c52f8c1..501414ebf3 100644 --- a/indra/llcommon/lltrace.cpp +++ b/indra/llcommon/lltrace.cpp @@ -32,7 +32,21 @@ namespace LLTrace { BlockTimer::Recorder::StackEntry BlockTimer::sCurRecorder; -LLThreadLocalPtr<ThreadTraceData> ThreadTraceData::sCurThreadTrace; + +MasterThreadTrace *gMasterThreadTrace = NULL; +LLThreadLocalPtr<ThreadTraceData> gCurThreadTrace; + +void init() +{ + gMasterThreadTrace = new MasterThreadTrace(); + gCurThreadTrace = gMasterThreadTrace; +} + +void cleanup() +{ + delete gMasterThreadTrace; +} + /////////////////////////////////////////////////////////////////////// // Sampler |