From c76ed72c609b80b08df6cebd68274c9da6d3de2c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 12 Nov 2012 19:12:20 -0800
Subject: [PATCH] SH-3406 WIP convert fast timers to lltrace system removed
remnants of LLFastTimer::FrameState
---
indra/llcommon/llfasttimer.cpp | 16 ++++++----------
indra/llcommon/llfasttimer.h | 16 ----------------
2 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index c4839fed773..66452fd02aa 100644
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -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);
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index 31872e4e657..40c2af34e81 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -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>
--
GitLab