Optimize LLViewerRegion getCapability with unordered_map and trivial string cleanup

3 files changed, 22 insertions, 19 deletions

diff --git a/indra/newview/llcapabilityprovider.h b/indra/newview/llcapabilityprovider.h
index 484bd2ef04..acc752588d 100644
--- a/indra/newview/llcapabilityprovider.h
+++ b/indra/newview/llcapabilityprovider.h
@@ -37,12 +37,12 @@
 class LLCapabilityProvider
 {
 public:
-    virtual ~LLCapabilityProvider() {}
+    virtual ~LLCapabilityProvider() = default;
     /**
      * Get a capability URL, given a capability name. Returns empty string if
      * no such capability is defined on this provider.
      */
-    virtual std::string getCapability(const std::string& name) const = 0;
+    virtual std::string getCapability(std::string_view name) const = 0;
     /**
      * Get host to which to send that capability request.
      */
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index cd70f8f9b9..42a587f376 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -104,7 +104,7 @@ S32  LLViewerRegion::sLastCameraUpdated = 0;
 S32  LLViewerRegion::sNewObjectCreationThrottle = -1;
 LLViewerRegion::vocache_entry_map_t LLViewerRegion::sRegionCacheCleanup;
 
-typedef std::map<std::string, std::string> CapabilityMap;
+typedef std::unordered_map<std::string, std::string, ll::string_hash, std::equal_to<>> CapabilityMap;
 
 static void log_capabilities(const CapabilityMap &capmap);
 
@@ -3437,7 +3437,7 @@ void LLViewerRegion::setCapabilityDebug(const std::string& name, const std::stri
     }
 }
 
-std::string LLViewerRegion::getCapabilityDebug(const std::string& name) const
+std::string LLViewerRegion::getCapabilityDebug(std::string_view name) const
 {
     CapabilityMap::const_iterator iter = mImpl->mSecondCapabilitiesTracker.find(name);
     if (iter == mImpl->mSecondCapabilitiesTracker.end())
@@ -3448,15 +3448,14 @@ std::string LLViewerRegion::getCapabilityDebug(const std::string& name) const
     return iter->second;
 }
 
-
-bool LLViewerRegion::isSpecialCapabilityName(const std::string &name)
+bool LLViewerRegion::isSpecialCapabilityName(std::string_view name)
 {
     return name == "EventQueueGet" || name == "UntrustedSimulatorMessage";
 }
 
-std::string LLViewerRegion::getCapability(const std::string& name) const
+std::string LLViewerRegion::getCapability(std::string_view name) const
 {
-    if (!capabilitiesReceived() && (name!=std::string("Seed")) && (name!=std::string("ObjectMedia")))
+    if (!capabilitiesReceived() && (name != "Seed") && (name != "ObjectMedia"))
     {
         LL_WARNS() << "getCapability called before caps received for " << name << LL_ENDL;
     }
@@ -3464,21 +3463,20 @@ std::string LLViewerRegion::getCapability(const std::string& name) const
     CapabilityMap::const_iterator iter = mImpl->mCapabilities.find(name);
     if(iter == mImpl->mCapabilities.end())
     {
-        return "";
+        return {};
     }
 
     return iter->second;
 }
 
-bool LLViewerRegion::isCapabilityAvailable(const std::string& name) const
+bool LLViewerRegion::isCapabilityAvailable(std::string_view name) const
 {
-    if (!capabilitiesReceived() && (name!=std::string("Seed")) && (name!=std::string("ObjectMedia")))
+    if (!capabilitiesReceived() && (name != "Seed") && (name != "ObjectMedia"))
     {
         LL_WARNS() << "isCapabilityAvailable called before caps received for " << name << LL_ENDL;
     }
 
-    CapabilityMap::const_iterator iter = mImpl->mCapabilities.find(name);
-    if(iter == mImpl->mCapabilities.end())
+    if (!mImpl->mCapabilities.contains(name))
     {
         return false;
     }
@@ -3734,9 +3732,14 @@ bool LLViewerRegion::avatarHoverHeightEnabled() const
 
 void log_capabilities(const CapabilityMap &capmap)
 {
+    // Copy into sorted map for ordered output
+    using SortedCapabilityMap = std::map<std::string, std::string>;
+    SortedCapabilityMap sorted_capmap;
+    sorted_capmap.insert(capmap.begin(), capmap.end());
+
     S32 count = 0;
-    CapabilityMap::const_iterator iter;
-    for (iter = capmap.begin(); iter != capmap.end(); ++iter, ++count)
+    SortedCapabilityMap::const_iterator iter;
+    for (iter = sorted_capmap.begin(); iter != sorted_capmap.end(); ++iter, ++count)
     {
         if (!iter->second.empty())
         {
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index b3ec857907..974bc375b8 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -274,10 +274,10 @@ public:
     S32 getNumSeedCapRetries();
     void setCapability(const std::string& name, const std::string& url);
     void setCapabilityDebug(const std::string& name, const std::string& url);
-    bool isCapabilityAvailable(const std::string& name) const;
+    bool isCapabilityAvailable(std::string_view name) const;
     // implements LLCapabilityProvider
-    virtual std::string getCapability(const std::string& name) const;
-    std::string getCapabilityDebug(const std::string& name) const;
+    virtual std::string getCapability(std::string_view name) const;
+    std::string getCapabilityDebug(std::string_view name) const;
 
 
     // has region received its final (not seed) capability list?
@@ -287,7 +287,7 @@ public:
     void setCapabilitiesError();
     boost::signals2::connection setCapabilitiesReceivedCallback(const caps_received_signal_t::slot_type& cb);
 
-    static bool isSpecialCapabilityName(const std::string &name);
+    static bool isSpecialCapabilityName(std::string_view name);
     void logActiveCapabilities() const;
 
     // Utilities to post and get via