livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed remaining sample and add calls

master
Richard Linden 2013-03-08 17:08:00 -08:00
parent 4a5f14afc9
commit 4e3fddf271
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterjoystick.cpp
View File

@ -77,7 +77,7 @@ void LLFloaterJoystick::draw()
for (U32 i = 0; i < 6; i++)
{
F32 value = joystick->getJoystickAxis(i);
sJoystickAxes[i]->sample(value * gFrameIntervalSeconds.value());
sample(*sJoystickAxes[i], value * gFrameIntervalSeconds.value());
if (mAxisStatsBar[i])
{
F32 minbar, maxbar;

6
indra/newview/llviewerassetstats.cpp
View File

@ -547,21 +547,21 @@ void record_enqueue(LLViewerAssetType::EType at, bool with_http, bool is_temp)
{
const EViewerAssetCategories eac(asset_type_to_category(at, with_http, is_temp));
sEnqueued[int(eac)]->add(1);
add(*sEnqueued[int(eac)], 1);
}
void record_dequeue(LLViewerAssetType::EType at, bool with_http, bool is_temp)
{
const EViewerAssetCategories eac(asset_type_to_category(at, with_http, is_temp));
sDequeued[int(eac)]->add(1);
add(*sDequeued[int(eac)], 1);
}
void record_response(LLViewerAssetType::EType at, bool with_http, bool is_temp, LLViewerAssetStats::duration_t duration)
{
const EViewerAssetCategories eac(asset_type_to_category(at, with_http, is_temp));
sResponse[int(eac)]->sample<LLTrace::Microseconds>(duration);
sample(*sResponse[int(eac)], LLTrace::Microseconds(duration));
}
void record_avatar_stats()

4
indra/newview/llviewercamera.cpp
View File

@ -167,8 +167,8 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
F32 drot;
rotation.getAngleAxis(&drot, &x, &y, &z);
sVelocityStat.add(dpos);
sAngularVelocityStat.add(drot);
add(sVelocityStat, dpos);
add(sAngularVelocityStat, drot);
mAverageSpeed = LLTrace::get_frame_recording().getPeriodMeanPerSec(sVelocityStat);
mAverageAngularSpeed = LLTrace::get_frame_recording().getPeriodMeanPerSec(sAngularVelocityStat);

13
indra/newview/llviewerstats.h
View File

@ -41,6 +41,8 @@ struct SimMeasurementSampler : public LLInstanceTracker<SimMeasurementSampler, E
: LLInstanceTracker<SimMeasurementSampler, ESimStatID>(id)
{}
virtual ~SimMeasurementSampler() {}
virtual void sample(F64 value) = 0;
};
template<typename T = F64>
@ -52,9 +54,18 @@ struct SimMeasurement : public LLTrace::MeasurementStatHandle<T>, public SimMeas
{}
using SimMeasurementSampler::getInstance;
/*virtual*/ void sample(F64 value)
{
LLTrace::sample(*this, value);
}
};
template<typename T, typename VALUE_T>
void sample(SimMeasurement<T>& measurement, VALUE_T value)
{
LLTrace::sample(measurement, value);
}
extern LLTrace::CountStatHandle<> FPS,
PACKETS_IN,
PACKETS_LOST,