Changeset 21829 for ps

Timestamp:

05/29/18 04:14:38 (7 years ago)

Author:

elexis

Message:

Test all full hashes in non-visual replaymode by default and keep skipping quick-hash by default.

The previous code only tested quick hashes every 100 turns and could not be used to confirm replay hashes matching.
The option can become used for visual replays too.

Differential Revision: ​https://code.wildfiregames.com/D1538
Refs #5162
Reviewed By: temple

Location:

ps/trunk

Files:

• binaries/system/readme.txt (modified) (1 diff)
• source/main.cpp (modified) (1 diff)
• source/ps/Replay.cpp (modified) (3 diffs)
• source/ps/Replay.h (modified) (3 diffs)

ps/trunk/binaries/system/readme.txt

@@ -79 +79 @@
 -unique-logs        adds unix timestamp and process id to the filename of mainlog.html, interestinglog.html
                     and oos_dump.txt to prevent these files from becoming overwritten by another pyrogenesis process.
+-hashtest-full=X    whether to enable computation of full hashes in replaymode (default true). Can be disabled to improve performance.
+-hashtest-quick=X   whether to enable computation of quick hashes in replaymode (default false). Can be enabled for debugging purposes.
 
 Windows-specific:

ps/trunk/source/main.cpp

@@ -555 +555 @@
                 args.Has("serializationtest"),
                 args.Has("rejointest") ? args.Get("rejointest").ToInt() : -1,
-                args.Has("ooslog"));
+                args.Has("ooslog"),
+                !args.Has("hashtest-full") || args.Get("hashtest-full") == "true",
+                args.Has("hashtest-quick") && args.Get("hashtest-quick") == "true");
         }
 

ps/trunk/source/ps/Replay.cpp

@@ -168 +168 @@
         LOGWARNING("%s\nThe mods of the replay are:\n%s\nThese mods are enabled:\n%s", warn, ModListToString(replayMods), ModListToString(enabledMods));
 }
-void CReplayPlayer::Replay(bool serializationtest, int rejointestturn, bool ooslog)
+
+void CReplayPlayer::Replay(const bool serializationtest, const int rejointestturn, const bool ooslog, const bool testHashFull, const bool testHashQuick)
 {
     ENSURE(m_Stream);
@@ -248 +249 @@
             std::string replayHash;
             *m_Stream >> replayHash;
-
-            bool quick = (type == "hash-quick");
-
-            if (turn % 100 == 0)
-            {
-                std::string hash;
-                bool ok = g_Game->GetSimulation2()->ComputeStateHash(hash, quick);
-                ENSURE(ok);
-                std::string hexHash = Hexify(hash);
-                if (hexHash == replayHash)
-                    debug_printf("hash ok (%s)\n", hexHash.c_str());
-                else
-                    debug_printf("HASH MISMATCH (%s != %s)\n", hexHash.c_str(), replayHash.c_str());
-            }
+            TestHash(type, replayHash, testHashFull, testHashQuick);
         }
         else if (type == "end")
@@ -308 +296 @@
     SAFE_DELETE(g_ScriptStatsTable);
 }
+
+void CReplayPlayer::TestHash(const std::string& hashType, const std::string& replayHash, const bool testHashFull, const bool testHashQuick)
+{
+    bool quick = (hashType == "hash-quick");
+    if ((quick && !testHashQuick) || (!quick && !testHashFull))
+        return;
+
+    std::string hash;
+    ENSURE(g_Game->GetSimulation2()->ComputeStateHash(hash, quick));
+
+    std::string hexHash = Hexify(hash);
+
+    if (hexHash == replayHash)
+        debug_printf("%s ok (%s)\n", hashType.c_str(), hexHash.c_str());
+    else
+        debug_printf("%s MISMATCH (%s != %s)\n", hashType.c_str(), hexHash.c_str(), replayHash.c_str());
+}

ps/trunk/source/ps/Replay.h

@@ -1 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -99 +99 @@
 
     void Load(const OsPath& path);
-    void Replay(bool serializationtest, int rejointestturn, bool ooslog);
+    void Replay(const bool serializationtest, const int rejointestturn, const bool ooslog, const bool testHashFull, const bool testHashQuick);
 
 private:
@@ -105 +105 @@
     CStr ModListToString(const std::vector<std::vector<CStr>>& list) const;
     void CheckReplayMods(const ScriptInterface& scriptInterface, JS::HandleValue attribs) const;
+    void TestHash(const std::string& hashType, const std::string& replayHash, const bool testHashFull, const bool testHashQuick);
 };