diff options
| author | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
| commit | 34ff2fc46ba8c623f0eab8fe1dccb5db327775a8 (patch) | |
| tree | 7bc422dd969e1d18e9d83e52a9a6dcfa2bd6139f /indra/llmessage/llioutil.cpp | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
| parent | d8e92867162f8c4ff9489d8eefde53546e907dff (diff) | |
merge with release
Diffstat (limited to 'indra/llmessage/llioutil.cpp')
| -rwxr-xr-x | indra/llmessage/llioutil.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llmessage/llioutil.cpp b/indra/llmessage/llioutil.cpp index 8c50fd5069..b8443c0600 100755 --- a/indra/llmessage/llioutil.cpp +++ b/indra/llmessage/llioutil.cpp @@ -28,6 +28,7 @@ #include "linden_common.h" #include "llioutil.h" +#include "llfasttimer.h" /** * LLIOFlush @@ -44,7 +45,7 @@ LLIOPipe::EStatus LLIOFlush::process_impl( } -static LLFastTimer::DeclareTimer FTM_PROCESS_SLEEP("IO Sleep"); +static LLTrace::BlockTimerStatHandle FTM_PROCESS_SLEEP("IO Sleep"); /** * @class LLIOSleep */ @@ -55,7 +56,7 @@ LLIOPipe::EStatus LLIOSleep::process_impl( LLSD& context, LLPumpIO* pump) { - LLFastTimer t(FTM_PROCESS_SLEEP); + LL_RECORD_BLOCK_TIME(FTM_PROCESS_SLEEP); if(mSeconds > 0.0) { if(pump) pump->sleepChain(mSeconds); @@ -65,7 +66,7 @@ LLIOPipe::EStatus LLIOSleep::process_impl( return STATUS_DONE; } -static LLFastTimer::DeclareTimer FTM_PROCESS_ADD_CHAIN("Add Chain"); +static LLTrace::BlockTimerStatHandle FTM_PROCESS_ADD_CHAIN("Add Chain"); /** * @class LLIOAddChain */ @@ -76,7 +77,7 @@ LLIOPipe::EStatus LLIOAddChain::process_impl( LLSD& context, LLPumpIO* pump) { - LLFastTimer t(FTM_PROCESS_ADD_CHAIN); + LL_RECORD_BLOCK_TIME(FTM_PROCESS_ADD_CHAIN); pump->addChain(mChain, mTimeout); return STATUS_DONE; } |