Ticket #3292: serializationChange_v2.patch

source/simulation2/Simulation2.cpp

@@ -44 +44 @@
 #include "ps/Util.h"
 #include "ps/XML/Xeromyces.h"
 
 #include <iomanip>
 
+const int hashStart = 5330;
+
 static std::string Hexify(const std::string& s) // TODO: shouldn't duplicate this function in so many places
 {
     std::stringstream str;
     str << std::hex;
     for (size_t i = 0; i < s.size(); ++i)
@@ -59 +61 @@
 {
 public:
     CSimulation2Impl(CUnitManager* unitManager, shared_ptr<ScriptRuntime> rt, CTerrain* terrain) :
         m_SimContext(), m_ComponentManager(m_SimContext, rt),
         m_EnableOOSLog(false), m_EnableSerializationTest(false),
-        m_MapSettings(rt->m_rt), m_InitAttributes(rt->m_rt)
+        m_MapSettings(rt->m_rt), m_InitAttributes(rt->m_rt), secondaryComponentManager(secondaryContext, rt)
     {
         m_SimContext.m_UnitManager = unitManager;
         m_SimContext.m_Terrain = terrain;
         m_ComponentManager.LoadComponentTypes();
 
@@ -78 +80 @@
 
         m_OOSLogPath = getDateIndexSubdirectory(psLogDir() / "oos_logs");
 
         if (m_EnableOOSLog)
             debug_printf("Writing ooslogs to %s\n", m_OOSLogPath.string8().c_str());
+
+        // Initialise the secondary simulation
+        secondaryContext.m_Terrain = &secondaryTerrain;
+        secondaryComponentManager.LoadComponentTypes();
     }
 
     ~CSimulation2Impl()
     {
         UnregisterFileReloadFunc(ReloadChangedFileCB, this);
@@ -133 +139 @@
     uint32_t m_TurnNumber;
 
     bool m_EnableOOSLog;
     OsPath m_OOSLogPath;
 
+    // Initialise the secondary simulation
+    CTerrain secondaryTerrain;
+    CSimContext secondaryContext;
+    CComponentManager secondaryComponentManager;
+    std::set<VfsPath> secondaryLoadedScripts;
+
     // Functions and data for the serialization test mode: (see Update() for relevant comments)
 
     bool m_EnableSerializationTest;
 
     struct SerializationTestState
@@ -346 +358 @@
     const bool serializationTestHash = true; // set true to save and compare hash of state
 
     SerializationTestState primaryStateBefore;
     ScriptInterface& scriptInterface = m_ComponentManager.GetScriptInterface();
 
-    if (m_EnableSerializationTest)
+    if (m_EnableSerializationTest && m_TurnNumber == hashStart)
+        ENSURE(LoadDefaultScripts(secondaryComponentManager, &secondaryLoadedScripts));
+
+    if (m_TurnNumber >= hashStart)
     {
         ENSURE(m_ComponentManager.SerializeState(primaryStateBefore.state));
         if (serializationTestDebugDump)
             ENSURE(m_ComponentManager.DumpDebugState(primaryStateBefore.debug, false));
         if (serializationTestHash)
@@ -360 +375 @@
     UpdateComponents(m_SimContext, turnLengthFixed, commands);
 
 
     if (m_EnableSerializationTest)
     {
-        // Initialise the secondary simulation
-        CTerrain secondaryTerrain;
-        CSimContext secondaryContext;
-        secondaryContext.m_Terrain = &secondaryTerrain;
-        CComponentManager secondaryComponentManager(secondaryContext, scriptInterface.GetRuntime());
-        secondaryComponentManager.LoadComponentTypes();
-        std::set<VfsPath> secondaryLoadedScripts;
-        ENSURE(LoadDefaultScripts(secondaryComponentManager, &secondaryLoadedScripts));
+        if (m_TurnNumber == hashStart)
+        {
         ResetComponentState(secondaryComponentManager, false, false);
 
         // Load the trigger scripts after we have loaded the simulation.
         {
             JSContext* cx2 = secondaryComponentManager.GetScriptInterface().GetContext();
@@ -405 +414 @@
                 NULL, NULL, &secondaryContext, INVALID_PLAYER, true); // throws exception on failure
         }
 
         LDR_EndRegistering();
         ENSURE(LDR_NonprogressiveLoad() == INFO::OK);
-
         ENSURE(secondaryComponentManager.DeserializeState(primaryStateBefore.state));
-
+        }
+        if (m_TurnNumber >= hashStart)
+        {
         SerializationTestState secondaryStateBefore;
         ENSURE(secondaryComponentManager.SerializeState(secondaryStateBefore.state));
         if (serializationTestDebugDump)
             ENSURE(secondaryComponentManager.DumpDebugState(secondaryStateBefore.debug, false));
         if (serializationTestHash)
@@ -443 +453 @@
             ENSURE(secondaryComponentManager.DumpDebugState(secondaryStateAfter.debug, false));
 
             ReportSerializationFailure(&primaryStateBefore, &primaryStateAfter, &secondaryStateBefore, &secondaryStateAfter);
         }
     }
+    }
 
     // Run the GC occasionally
     // No delay because a lot of garbage accumulates in one turn and in non-visual replays there are
     // much more turns in the same time than in normal games.
     // Every 500 turns we run a shrinking GC, which decommits unused memory and frees all JIT code.
@@ -459 +470 @@
     if (m_TurnNumber % 500 == 0)
         scriptInterface.GetRuntime()->ShrinkingGC();
     else
         scriptInterface.GetRuntime()->MaybeIncrementalGC(0.0f);
 
-    if (m_EnableOOSLog)
+    if (m_EnableOOSLog && m_TurnNumber >= hashStart)
         DumpState();
 
     // Start computing AI for the next turn
     CmpPtr<ICmpAIManager> cmpAIManager(m_SimContext, SYSTEM_ENTITY);
     if (cmpAIManager)