diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-02 19:12:59 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-02 19:12:59 -0400 |
| commit | 960139aa6f02f90c6102d3c5d5c38b5ebe689f9c (patch) | |
| tree | 013c7b51afe4b765723fbf5ebf41fb6640d3d09a /indra/llcommon/lldeadmantimer.cpp | |
| parent | 11cca95187f01f594172ca950315dcd8d99dc2c3 (diff) | |
SH-4161 Integrate cpu metrics into LLDeadmanTimer and then metrics viewer
Normalize deadman timer's args on U64/F64. Internals remain the
same. Modify mesh to collect and output enhanced CPU metrics.
Diffstat (limited to 'indra/llcommon/lldeadmantimer.cpp')
| -rw-r--r-- | indra/llcommon/lldeadmantimer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/lldeadmantimer.cpp b/indra/llcommon/lldeadmantimer.cpp index 2ba757d2af..7d9097e344 100644 --- a/indra/llcommon/lldeadmantimer.cpp +++ b/indra/llcommon/lldeadmantimer.cpp @@ -110,13 +110,13 @@ void LLDeadmanTimer::stop(time_type now) bool LLDeadmanTimer::isExpired(time_type now, F64 & started, F64 & stopped, U64 & count, - LLProcInfo::time_type & user_cpu, LLProcInfo::time_type & sys_cpu) + U64 & user_cpu, U64 & sys_cpu) { const bool status(isExpired(now, started, stopped, count)); if (status) { - user_cpu = mUEndCPU - mUStartCPU; - sys_cpu = mSEndCPU - mSStartCPU; + user_cpu = U64(mUEndCPU - mUStartCPU); + sys_cpu = U64(mSEndCPU - mSStartCPU); } return status; } |