diff options
author | Richard Linden <none@none> | 2013-01-17 20:11:43 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-01-17 20:11:43 -0800 |
commit | 43a92d01afdb4f1dd4003059b79f87e9687527a1 (patch) | |
tree | 44327860f7de3b8a1475bc2dd3322fd459ee943b /indra/llcommon/lltracethreadrecorder.cpp | |
parent | 486743e77efaa3926ddc2c0d666a0a7192700475 (diff) |
SH-3406 WIP convert fast timers to lltrace system
fixed some uninitialized variables
root timer accumulator was being initialized to NULL
Diffstat (limited to 'indra/llcommon/lltracethreadrecorder.cpp')
-rw-r--r-- | indra/llcommon/lltracethreadrecorder.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp index bc1d19e72c..7c5995a104 100644 --- a/indra/llcommon/lltracethreadrecorder.cpp +++ b/indra/llcommon/lltracethreadrecorder.cpp @@ -43,14 +43,16 @@ ThreadRecorder::ThreadRecorder() TimeBlock& root_time_block = TimeBlock::getRootTimeBlock(); ThreadTimerStack* timer_stack = ThreadTimerStack::getInstance(); - timer_stack->mAccumulator = root_time_block.getPrimaryAccumulator(); - timer_stack->mActiveTimer = NULL; mNumTimeBlockTreeNodes = AccumulatorBuffer<TimeBlockAccumulator>::getDefaultBuffer()->size(); mTimeBlockTreeNodes = new TimeBlockTreeNode[mNumTimeBlockTreeNodes]; mThreadRecording.start(); + timer_stack->mAccumulator = root_time_block.getPrimaryAccumulator(); + timer_stack->mActiveTimer = NULL; + + // initialize time block parent pointers for (LLInstanceTracker<TimeBlock>::instance_iter it = LLInstanceTracker<TimeBlock>::beginInstances(), end_it = LLInstanceTracker<TimeBlock>::endInstances(); it != end_it; |