diff options
| author | Richard Linden <none@none> | 2012-08-24 16:31:29 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-24 16:31:29 -0700 |
| commit | 93578f7e519026ca286f54595c3b10d3926e0db3 (patch) | |
| tree | 8729fc04887b6d91f67f5e6b4284a3d9d18d8dce /indra/llmessage/llpumpio.cpp | |
| parent | e6dc88241b58ebc1f05f96279f1f189b1d5e8885 (diff) | |
| parent | af8653d7598418e929718ede6742589719ffb2fb (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/llmessage/llpumpio.cpp')
| -rw-r--r-- | indra/llmessage/llpumpio.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp index 97db666e6b..0623e99f0a 100644 --- a/indra/llmessage/llpumpio.cpp +++ b/indra/llmessage/llpumpio.cpp @@ -35,7 +35,6 @@ #include "llapr.h" #include "llstl.h" -#include "llstat.h" // These should not be enabled in production, but they can be // intensely useful during development for finding certain kinds of @@ -432,6 +431,7 @@ void LLPumpIO::pump() } static LLFastTimer::DeclareTimer FTM_PUMP_IO("Pump IO"); +static LLFastTimer::DeclareTimer FTM_PUMP_POLL("Pump Poll"); LLPumpIO::current_chain_t LLPumpIO::removeRunningChain(LLPumpIO::current_chain_t& run_chain) { @@ -526,7 +526,7 @@ void LLPumpIO::pump(const S32& poll_timeout) S32 count = 0; S32 client_id = 0; { - LLPerfBlock polltime("pump_poll"); + LLFastTimer _(FTM_PUMP_POLL); apr_pollset_poll(mPollset, poll_timeout, &count, &poll_fd); } PUMP_DEBUG; |