diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
| commit | 7f50e28b0f3905f95299f7d5d63e0fd82e103bed (patch) | |
| tree | 99c01f8184cc9a5ca90484661b30a8ac6dcd60f4 /indra/llmessage | |
| parent | 47576ad1f77ecbe606fa1bd3addac610fad43dd7 (diff) | |
merge -r 56842:57026 maintenance.
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llpumpio.cpp | 1 | ||||
| -rw-r--r-- | indra/llmessage/llurlrequest.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp index 0c5bd1eaea..5abc63fad0 100644 --- a/indra/llmessage/llpumpio.cpp +++ b/indra/llmessage/llpumpio.cpp @@ -316,6 +316,7 @@ bool LLPumpIO::copyCurrentLinkInfo(links_t& links) const void LLPumpIO::pump() { LLMemType m1(LLMemType::MTYPE_IO_PUMP); + LLFastTimer t1(LLFastTimer::FTM_PUMP); //llinfos << "LLPumpIO::pump()" << llendl; // Run any pending runners. diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index 0d784d2d9f..df9c0149d4 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -251,6 +251,7 @@ LLIOPipe::EStatus LLURLRequest::process_impl( S32 queue; do { + LLFastTimer t2(LLFastTimer::FTM_CURL); code = curl_multi_perform(mDetail->mCurlMulti, &queue); }while((CURLM_CALL_MULTI_PERFORM == code) && (queue > 0) && count--); CURLMsg* curl_msg; |