diff options
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llcoproceduremanager.cpp | 21 | ||||
| -rw-r--r-- | indra/llmessage/message.cpp | 1 | 
2 files changed, 21 insertions, 1 deletions
| diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp index d310cefd1e..ebbaea9b12 100644 --- a/indra/llmessage/llcoproceduremanager.cpp +++ b/indra/llmessage/llcoproceduremanager.cpp @@ -364,7 +364,26 @@ LLUUID LLCoprocedurePool::enqueueCoprocedure(const std::string &name, LLCoproced  {      LLUUID id(LLUUID::generateNewID()); -    LL_INFOS("CoProcMgr") << "Coprocedure(" << name << ") enqueuing with id=" << id.asString() << " in pool \"" << mPoolName << "\" at " << mPending << LL_ENDL; +    if (mPoolName == "AIS") +    { +        // Fetch is going to be spammy. +        LL_DEBUGS("CoProcMgr", "Inventory") << "Coprocedure(" << name << ") enqueuing with id=" << id.asString() << " in pool \"" << mPoolName +                                   << "\" at " +                              << mPending << LL_ENDL; + +        if (mPending >= (LLCoprocedureManager::DEFAULT_QUEUE_SIZE - 1)) +        { +            // If it's all used up (not supposed to happen, +            // fetched should cap it), we are going to crash +            LL_WARNS("CoProcMgr", "Inventory") << "About to run out of queue space for Coprocedure(" << name +                                               << ") enqueuing with id=" << id.asString() << " Already pending:" << mPending << LL_ENDL; +        } +    } +    else +    { +        LL_INFOS("CoProcMgr") << "Coprocedure(" << name << ") enqueuing with id=" << id.asString() << " in pool \"" << mPoolName << "\" at " +                              << mPending << LL_ENDL; +    }      auto pushed = mPendingCoprocs->try_push(boost::make_shared<QueuedCoproc>(name, id, proc));      if (pushed == boost::fibers::channel_op_status::success)      { diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index 19146c64f4..31acc65642 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -3402,6 +3402,7 @@ typedef std::map<const char*, LLMessageBuilder*> BuilderMap;  void LLMessageSystem::newMessageFast(const char *name)  { +	//LL_DEBUGS("Messaging") << "creating new message: " << name << LL_ENDL;  	LLMessageConfig::Flavor message_flavor =  		LLMessageConfig::getMessageFlavor(name);  	LLMessageConfig::Flavor server_flavor = | 
