Move associated experience fetching into the ExperienceCache as a coro remove the responder.

2 files changed, 70 insertions, 9 deletions

diff --git a/indra/llmessage/llexperiencecache.cpp b/indra/llmessage/llexperiencecache.cpp
index 36a4fc8823..b65a3c59d5 100644
--- a/indra/llmessage/llexperiencecache.cpp
+++ b/indra/llmessage/llexperiencecache.cpp
@@ -356,7 +356,7 @@ void LLExperienceCache::requestExperiences()
         
         if (mRequestQueue.empty() || (ostr.tellp() > EXP_URL_SEND_THRESHOLD))
         {   // request is placed in the coprocedure pool for the ExpCache cache.  Throttling is done by the pool itself.
-            LLCoprocedureManager::getInstance()->enqueueCoprocedure("ExpCache", "Request",
+            LLCoprocedureManager::getInstance()->enqueueCoprocedure("ExpCache", "RequestExperiences",
                 boost::bind(&LLExperienceCache::requestExperiencesCoro, this, _1, ostr.str(), requests) );
 
             ostr.str(std::string());
@@ -506,7 +506,8 @@ const LLSD& LLExperienceCache::get(const LLUUID& key)
 
 	return empty;
 }
-void LLExperienceCache::get(const LLUUID& key, LLExperienceCache::Callback_t slot)
+
+void LLExperienceCache::get(const LLUUID& key, LLExperienceCache::ExperienceGetFn_t slot)
 {
 	if(key.isNull()) 
 		return;
@@ -533,6 +534,64 @@ void LLExperienceCache::get(const LLUUID& key, LLExperienceCache::Callback_t slo
 }
 
 //=========================================================================
+void LLExperienceCache::fetchAssociatedExperience(const LLUUID& objectId, const LLUUID& itemId, ExperienceGetFn_t fn)
+{
+    if (mCapability.empty())
+    {
+        LL_WARNS("ExperienceCache") << "Capability query method not set." << LL_ENDL;
+        return;
+    }
+
+    LLCoprocedureManager::getInstance()->enqueueCoprocedure("ExpCache", "Fetch Associated",
+        boost::bind(&LLExperienceCache::fetchAssociatedExperienceCoro, this, _1, objectId, itemId, fn));
+}
+
+void LLExperienceCache::fetchAssociatedExperienceCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter, LLUUID objectId, LLUUID itemId, ExperienceGetFn_t fn)
+{
+    LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest());
+
+    std::string url = mCapability("GetMetadata");
+    if (url.empty())
+    {
+        LL_WARNS("ExperienceCache") << "No Metadata capability." << LL_ENDL;
+        return;
+    }
+
+    LLSD fields;
+    fields.append("experience");
+    LLSD data;
+    data["object-id"] = objectId;
+    data["item-id"] = itemId;
+    data["fields"] = fields;
+
+    LLSD result = httpAdapter->postAndYield(httpRequest, url, data);
+
+    LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+    LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
+
+    if ((!status) || (!result.has("experience")))
+    {
+        LLSD failure;
+        if (!status)
+        {
+            failure["error"] = (LLSD::Integer)status.getType();
+            failure["message"] = status.getMessage();
+        }
+        else 
+        {
+            failure["error"] = -1;
+            failure["message"] = "no experience";
+        }
+        if (fn && !fn.empty())
+            fn(failure);
+        return;
+    }
+
+    LLUUID expId = result["experience"].asUUID();
+    get(expId, fn);
+}
+
+//=========================================================================
 void LLExperienceCacheImpl::mapKeys(const LLSD& legacyKeys)
 {
 	LLSD::array_const_iterator exp = legacyKeys.beginArray();
diff --git a/indra/llmessage/llexperiencecache.h b/indra/llmessage/llexperiencecache.h
index 937225a80a..d1222933df 100644
--- a/indra/llmessage/llexperiencecache.h
+++ b/indra/llmessage/llexperiencecache.h
@@ -47,22 +47,25 @@ class LLExperienceCache: public LLSingleton < LLExperienceCache >
 
 public:
     typedef boost::function<std::string(const std::string &)> CapabilityQuery_t;
-    typedef boost::function<void(const LLSD &)> Callback_t;
+    typedef boost::function<void(const LLSD &)> ExperienceGetFn_t;
 
+    void setCapabilityQuery(CapabilityQuery_t queryfn);
     void cleanup();
 
+    //-------------------------------------------
+    // Cache methods 
     void erase(const LLUUID& key);
     bool fetch(const LLUUID& key, bool refresh = false);
     void insert(const LLSD& experience_data);
     const LLSD& get(const LLUUID& key);
-
-    // If name information is in cache, callback will be called immediately.
-    void get(const LLUUID& key, Callback_t slot);
+    void get(const LLUUID& key, ExperienceGetFn_t slot); // If name information is in cache, callback will be called immediately.
 
     bool isRequestPending(const LLUUID& public_key);
 
-    void setCapabilityQuery(CapabilityQuery_t queryfn);
+    //-------------------------------------------
+    void fetchAssociatedExperience(const LLUUID& objectId, const LLUUID& itemId, ExperienceGetFn_t fn);
 
+    //-------------------------------------------
     static const std::string NAME;			// "name"
     static const std::string EXPERIENCE_ID;	// "public_id"
     static const std::string AGENT_ID;      // "agent_id"
@@ -120,7 +123,6 @@ private:
 	RequestQueue_t	mRequestQueue;
     PendingQueue_t  mPendingQueue;
 
-    LLFrameTimer    mRequestTimer;
     LLFrameTimer    mEraseExpiredTimer;    // Periodically clean out expired entries from the cache
     CapabilityQuery_t mCapability;
     std::string     mCacheFileName;
@@ -131,7 +133,7 @@ private:
     void requestExperiencesCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &, std::string, RequestQueue_t);
     void requestExperiences();
 
-	void setMaximumLookups(int maximumLookups);
+    void fetchAssociatedExperienceCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &, LLUUID objectId, LLUUID itemId, ExperienceGetFn_t fn);
 
     void bootstrap(const LLSD& legacyKeys, int initialExpiration);
     void exportFile(std::ostream& ostr) const;