summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-12-19 15:35:38 -0600
committerDave Parks <davep@lindenlab.com>2011-12-19 15:35:38 -0600
commit58f9982fbc94ed2f039f0cd32579fa572f87e8ba (patch)
tree56f1e1cff7ae49acbf5156e76d5467f1a345443b /indra/llmessage
parentc7f9c3af3c16fbc1411719c63786ac1ecb86f89a (diff)
SH-2738 Add comment documenting need to not make main thread wait on curl_multi_perform
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llcurl.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 874f4673ca..20f0c6c602 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -675,6 +675,10 @@ bool LLCurl::Multi::doPerform()
call_count++)
{
LLMutexLock lock(mMutexp) ;
+
+ //WARNING: curl_multi_perform will block for many hundreds of milliseconds
+ // NEVER call this from the main thread, and NEVER allow the main thread to
+ // wait on a mutex held by this thread while curl_multi_perform is executing
CURLMcode code = curl_multi_perform(mCurlMultiHandle, &q);
if (CURLM_CALL_MULTI_PERFORM != code || q == 0)
{