Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Un-inline LLFastTimer::NamedTimer::getCountAverage and LLFastTimer::NamedTimer::getCallAverage so some experimenting can be done in llfasttimer_class.cpp without massive recompiles.

Browse Source
This commit is contained in:
Shyotl
2012-01-25 20:14:38 -06:00
parent 29cdfdc13e
commit cef03d52cb
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llcommon/llfasttimer_class.cpp
View File

@@ -498,6 +498,15 @@ void LLFastTimer::NamedTimer::accumulateTimings()
} }
} }
U32 LLFastTimer::NamedTimer::getCountAverage() const
{
return mCountAverage;// (sCurFrameIndex <= 0 || mCountAverage <= 0) ? 0 : mCountAverage / llmin(sCurFrameIndex,(S32)HISTORY_NUM);
}
U32 LLFastTimer::NamedTimer::getCallAverage() const
{
return mCallAverage;// (sCurFrameIndex <= 0 || mCallAverage <= 0) ? 0 : mCallAverage / llmin(sCurFrameIndex,(S32)HISTORY_NUM);
}
// static // static
void LLFastTimer::NamedTimer::resetFrame() void LLFastTimer::NamedTimer::resetFrame()
{ {

4
indra/llcommon/llfasttimer_class.h
View File

@@ -82,8 +82,8 @@ public:
void setCollapsed(bool collapsed) { mCollapsed = collapsed; } void setCollapsed(bool collapsed) { mCollapsed = collapsed; }
bool getCollapsed() const { return mCollapsed; } bool getCollapsed() const { return mCollapsed; }
U32 getCountAverage() const { return mCountAverage; } U32 getCountAverage() const; //{ return mCountAverage }
U32 getCallAverage() const { return mCallAverage; } U32 getCallAverage() const; //{ return mCallAverage }
U32 getHistoricalCount(S32 history_index = 0) const; U32 getHistoricalCount(S32 history_index = 0) const;
U32 getHistoricalCalls(S32 history_index = 0) const; U32 getHistoricalCalls(S32 history_index = 0) const;