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

SH-3406 WIP convert fast timers to lltrace system

removed remnants of LLFastTimer::FrameState
parent a3e3e8b4
No related branches found
No related tags found
No related merge requests found
......@@ -140,15 +140,6 @@ U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer
}
#endif
LLFastTimer::FrameState::FrameState()
: mActiveCount(0),
mCalls(0),
mSelfTimeCounter(0),
mLastCaller(NULL),
mMoveUpTree(false)
{}
LLFastTimer::DeclareTimer::DeclareTimer(const std::string& name, bool open, DeclareTimer* parent)
: mName(name),
mCollapsed(true),
......@@ -156,7 +147,12 @@ LLFastTimer::DeclareTimer::DeclareTimer(const std::string& name, bool open, Decl
mTreeTimeCounter(0),
mCountAverage(0),
mCallAverage(0),
mNeedsSorting(false)
mNeedsSorting(false),
mActiveCount(0),
mCalls(0),
mSelfTimeCounter(0),
mLastCaller(NULL),
mMoveUpTree(false)
{
setCollapsed(!open);
......
......@@ -38,25 +38,9 @@ class LLMutex;
#define LL_FASTTIMER_USE_RDTSC 1
LL_COMMON_API void assert_main_thread();
class LL_COMMON_API LLFastTimer
{
public:
class DeclareTimer;
struct LL_COMMON_API FrameState
{
FrameState();
U32 mSelfTimeCounter;
U32 mTotalTimeCounter;
U32 mCalls;
DeclareTimer* mLastCaller; // used to bootstrap tree construction
U16 mActiveCount; // number of timers with this ID active on stack
bool mMoveUpTree; // needs to be moved up the tree of timers at the end of frame
};
// stores a "named" timer instance to be reused via multiple LLFastTimer stack instances
class LL_COMMON_API DeclareTimer
: public LLInstanceTracker<DeclareTimer>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment