Ticket #4046: AiProxyOptim.patch

source/simulation2/Simulation2.cpp

@@ -678 +678 @@
     JSAutoRequest rq(cx);
     JS::RootedValue global(cx, GetScriptInterface().GetGlobalObject());
     GetScriptInterface().CallFunctionVoid(global, "InitGame", data);
+
+    CmpPtr<ICmpAIManager> cmpAIManager(m->m_SimContext, SYSTEM_ENTITY);
+    if (!cmpAIManager->HasActiveAIs())
+        m->m_ComponentManager.SkipAiProxy();
 }
 
 void CSimulation2::Update(int turnLength)

source/simulation2/components/CCmpAIManager.cpp

@@ -1159 +1159 @@
         }
     }
 
+    virtual bool HasActiveAIs()
+    {
+        return m_Worker.getPlayerSize() > 0;
+    }
+
 private:
     std::vector<std::string> m_TemplateNames;
     size_t m_TemplateLoadedIdx;

source/simulation2/components/ICmpAIManager.h

@@ -48 +48 @@
     virtual void PushCommands() = 0;
 
     /**
+     * Returns true if there are currently any AI registered with the AiManager
+     */
+    virtual bool HasActiveAIs() = 0;
+
+    /**
      * Returns a vector of {"id":"value-for-AddPlayer", "name":"Human readable name"}
      * objects, based on all the available AI scripts.
      */

source/simulation2/system/ComponentManager.cpp

@@ -26 +26 @@
 
 #include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpTemplateManager.h"
+#include "simulation2/components/ICmpAiManager.h"
 
 #include "lib/utf8.h"
 #include "ps/CLogger.h"
@@ -543 +544 @@
     m_RNG.seed(seed);
 }
 
+void CComponentManager::SkipAiProxy()
+{
+    // don't actually delete the components, just make AIProxy not subscribe to anything
+    for (auto& messageType : m_LocalMessageSubscriptions)
+    {
+        // 49 is AIProxy CID
+        std::vector<ComponentTypeId>::iterator aiproxy = std::find(messageType.second.begin(),messageType.second.end(), 49);
+        if (aiproxy != messageType.second.end())
+        {
+            // pop and swap, I do not believe we actually care about the order here.
+            std::swap(*aiproxy, messageType.second.back());
+            messageType.second.pop_back();
+        }
+    }
+}
+
+
 void CComponentManager::RegisterComponentType(InterfaceId iid, ComponentTypeId cid, AllocFunc alloc, DeallocFunc dealloc,
         const char* name, const std::string& schema)
 {
@@ -874 +892 @@
             continue;
 
         CComponentManager::ComponentTypeId cid = LookupCID(it->first);
+
         if (cid == CID__Invalid)
         {
             LOGERROR("Unrecognised component type name '%s' in entity template '%s'", it->first, utf8_from_wstring(templateName));

source/simulation2/system/ComponentManager.h

@@ -301 +301 @@
      */
     void SetRNGSeed(u32 seed);
 
+    /**
+     * Tells the Component Manager to remove subscriptions of AIProxy, effectively acting like it didn't exist
+     * This is called by the simulation after game initialisation if there are no AI players present
+     * Since AIProxy can end up taking several ms (>3/4) per turn doing nothing useful otherwise
+     * Intended to make MP games faster.
+     */
+    void SkipAiProxy();
+
     // Various state serialization functions:
     bool ComputeStateHash(std::string& outHash, bool quick);
     bool DumpDebugState(std::ostream& stream, bool includeDebugInfo);
@@ -385 +393 @@
 
     boost::rand48 m_RNG;
 
+    bool m_SkipAiProxy = false;
+
     friend class TestComponentManager;
 };