Skip to content
Snippets Groups Projects
Commit f015903c authored by Richard Linden's avatar Richard Linden
Browse files

Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting

parents 21a7b6ea 8d4ceab6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/llcommon/lltrace.h
+ 5
− 4
View file @ f015903c
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#define LL_LLTRACE_H #define LL_LLTRACE_H
#include "stdtypes.h" #include "stdtypes.h"
#include "llpreprocessor.h"
#include <vector> #include <vector>
#include <boost/type_traits/alignment_of.hpp> #include <boost/type_traits/alignment_of.hpp>
...@@ -176,8 +177,8 @@ namespace LLTrace ...@@ -176,8 +177,8 @@ namespace LLTrace
accumulator->mChildTimeCounter += sCurRecorder.mChildTime; accumulator->mChildTimeCounter += sCurRecorder.mChildTime;
accumulator->mActiveCount--; accumulator->mActiveCount--;
accumulator->mLastCaller = mLastRecorder->mAccumulator; accumulator->mLastCaller = mLastRecorder.mAccumulator;
mLastRecorder->mChildTime += total_time; mLastRecorder.mChildTime += total_time;
// pop stack // pop stack
sCurRecorder = mLastRecorder; sCurRecorder = mLastRecorder;
...@@ -188,7 +189,7 @@ namespace LLTrace ...@@ -188,7 +189,7 @@ namespace LLTrace
}; };
private: private:
U32 getCPUClockCount32() static U32 getCPUClockCount32()
{ {
U32 ret_val; U32 ret_val;
__asm __asm
...@@ -219,7 +220,7 @@ namespace LLTrace ...@@ -219,7 +220,7 @@ namespace LLTrace
return ret_val; return ret_val;
} }
static RecorderStackEntry* sCurRecorder; static RecorderStackEntry sCurRecorder;
}; };
BlockTimer::RecorderStackEntry BlockTimer::sCurRecorder; BlockTimer::RecorderStackEntry BlockTimer::sCurRecorder;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment