Ticket #3615: serialization.patch

simulation2/Simulation2.cpp

@@ -65 +65 @@
     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),
+        serializationTestTerrain(NULL), serializationTestContext(NULL),
+        serializationTestComponentManager(NULL)
     {
         m_SimContext.m_UnitManager = unitManager;
         m_SimContext.m_Terrain = terrain;
@@ -83 +85 @@
 
     ~CSimulation2Impl()
     {
+        delete serializationTestTerrain;
+        delete serializationTestContext;
+        delete serializationTestComponentManager;
+        
         UnregisterFileReloadFunc(ReloadChangedFileCB, this);
     }
 
@@ -145 +151 @@
         std::string hash;
     };
 
+    // Store pointers to the components used by the serialization test.
+    CTerrain* serializationTestTerrain;
+    CSimContext* serializationTestContext;
+    CComponentManager* serializationTestComponentManager;
+
+
     void DumpSerializationTestState(SerializationTestState& state, const OsPath& path, const OsPath::String& suffix);
 
     void ReportSerializationFailure(
@@ -360 +372 @@
 
     if (m_EnableSerializationTest)
     {
-        // Initialise the secondary simulation
-        CTerrain secondaryTerrain;
-        CSimContext secondaryContext;
-        secondaryContext.m_Terrain = &secondaryTerrain;
-        CComponentManager secondaryComponentManager(secondaryContext, scriptInterface.GetRuntime());
-        secondaryComponentManager.LoadComponentTypes();
+        // Initialize the serialization test sim the first time
+        // This avoids creating a map every time.
+        if (!serializationTestComponentManager)
+        {
+            serializationTestTerrain = new CTerrain;
+            serializationTestContext = new CSimContext;
+            serializationTestContext->m_Terrain = serializationTestTerrain;
+            serializationTestComponentManager = new CComponentManager(*serializationTestContext, scriptInterface.GetRuntime());
+            serializationTestComponentManager->LoadComponentTypes();
         std::set<VfsPath> secondaryLoadedScripts;
-        ENSURE(LoadDefaultScripts(secondaryComponentManager, &secondaryLoadedScripts));
-        ResetComponentState(secondaryComponentManager, false, false);
+            ENSURE(LoadDefaultScripts(*serializationTestComponentManager, &secondaryLoadedScripts));
+            ResetComponentState(*serializationTestComponentManager, false, false);
 
-        // Load the trigger scripts after we have loaded the simulation.
-        {
-            JSContext* cx2 = secondaryComponentManager.GetScriptInterface().GetContext();
-            JSAutoRequest rq2(cx2);
-            JS::RootedValue mapSettingsCloned(cx2, 
-                secondaryComponentManager.GetScriptInterface().CloneValueFromOtherContext(
-                    scriptInterface, m_MapSettings));
-            ENSURE(LoadTriggerScripts(secondaryComponentManager, mapSettingsCloned, &secondaryLoadedScripts));
-        }
-
         // Load the map into the secondary simulation
-
         LDR_BeginRegistering();
         CMapReader* mapReader = new CMapReader; // automatically deletes itself
             
+            JSContext* cx2 = serializationTestComponentManager->GetScriptInterface().GetContext();
+            JSAutoRequest rq2(cx2);
+            JS::RootedValue mapSettingsCloned(cx2, serializationTestComponentManager->GetScriptInterface().CloneValueFromOtherContext(scriptInterface, m_MapSettings));
+
+            
         std::string mapType;
         scriptInterface.GetProperty(m_InitAttributes, "mapType", mapType);
         if (mapType == "random")
         {
-            // TODO: support random map scripts
-            debug_warn(L"Serialization test mode does not support random maps");
+                std::wstring scriptFile;
+                scriptInterface.GetProperty(m_InitAttributes, "script", scriptFile);
+
+                mapReader->LoadRandomMap(scriptFile, scriptInterface.GetJSRuntime(), mapSettingsCloned,
+                                   serializationTestTerrain, NULL, NULL, NULL, NULL, NULL, NULL,
+                                   NULL, g_Game->GetSimulation2(), INVALID_PLAYER, true); // throws exception on failure
         }
         else
         {
@@ -399 +412 @@
 
             VfsPath mapfilename = VfsPath(mapFile).ChangeExtension(L".pmp");
             mapReader->LoadMap(mapfilename, scriptInterface.GetJSRuntime(), JS::UndefinedHandleValue,
-                &secondaryTerrain, NULL, NULL, NULL, NULL, NULL, NULL,
-                NULL, NULL, &secondaryContext, INVALID_PLAYER, true); // throws exception on failure
+                                   serializationTestTerrain, NULL, NULL, NULL, NULL, NULL, NULL,
+                                   NULL, NULL, serializationTestContext, INVALID_PLAYER, true); // throws exception on failure
         }
+            // Load the trigger scripts after we have loaded the simulation.
+            ENSURE(LoadTriggerScripts(*serializationTestComponentManager, mapSettingsCloned, &secondaryLoadedScripts));
 
         LDR_EndRegistering();
         ENSURE(LDR_NonprogressiveLoad() == INFO::OK);
+        }
 
-        ENSURE(secondaryComponentManager.DeserializeState(primaryStateBefore.state));
+        ENSURE(serializationTestComponentManager->DeserializeState(primaryStateBefore.state));
 
         SerializationTestState secondaryStateBefore;
-        ENSURE(secondaryComponentManager.SerializeState(secondaryStateBefore.state));
+        ENSURE(serializationTestComponentManager->SerializeState(secondaryStateBefore.state));
         if (serializationTestDebugDump)
-            ENSURE(secondaryComponentManager.DumpDebugState(secondaryStateBefore.debug, false));
+            ENSURE(serializationTestComponentManager->DumpDebugState(secondaryStateBefore.debug, false));
         if (serializationTestHash)
-            ENSURE(secondaryComponentManager.ComputeStateHash(secondaryStateBefore.hash, false));
+            ENSURE(serializationTestComponentManager->ComputeStateHash(secondaryStateBefore.hash, false));
 
         if (primaryStateBefore.state.str() != secondaryStateBefore.state.str() ||
             primaryStateBefore.hash != secondaryStateBefore.hash)
@@ -426 +442 @@
         if (serializationTestHash)
             ENSURE(m_ComponentManager.ComputeStateHash(primaryStateAfter.hash, false));
 
-        UpdateComponents(secondaryContext, turnLengthFixed,
-            CloneCommandsFromOtherContext(scriptInterface, secondaryComponentManager.GetScriptInterface(), commands));
+        UpdateComponents(*serializationTestContext, turnLengthFixed,
+            CloneCommandsFromOtherContext(scriptInterface, serializationTestComponentManager->GetScriptInterface(), commands));
+
         SerializationTestState secondaryStateAfter;
-        ENSURE(secondaryComponentManager.SerializeState(secondaryStateAfter.state));
+        ENSURE(serializationTestComponentManager->SerializeState(secondaryStateAfter.state));
         if (serializationTestHash)
-            ENSURE(secondaryComponentManager.ComputeStateHash(secondaryStateAfter.hash, false));
+            ENSURE(serializationTestComponentManager->ComputeStateHash(secondaryStateAfter.hash, false));
 
         if (primaryStateAfter.state.str() != secondaryStateAfter.state.str() ||
             primaryStateAfter.hash != secondaryStateAfter.hash)
@@ -438 +455 @@
         {
             // Only do the (slow) dumping now we know we're going to need to report it
             ENSURE(m_ComponentManager.DumpDebugState(primaryStateAfter.debug, false));
-            ENSURE(secondaryComponentManager.DumpDebugState(secondaryStateAfter.debug, false));
+            ENSURE(serializationTestComponentManager->DumpDebugState(secondaryStateAfter.debug, false));
 
             ReportSerializationFailure(&primaryStateBefore, &primaryStateAfter, &secondaryStateBefore, &secondaryStateAfter);
         }