Ticket #3637: hash_dump.patch

source/ps/Game.cpp

@@ -56 +56 @@
 
 /**
  * Globally accessible pointer to the CGame object.
  **/
 CGame *g_Game=NULL;
+// I'm not supposed to be here
+char g_HashDirectory[2048];
+FILE* g_HashFile;
 
 /**
  * Constructor
  *
  **/

source/ps/Game.h

@@ -17 +17 @@
 
 #ifndef INCLUDED_GAME
 #define INCLUDED_GAME
 
 #include "ps/Errors.h"
+#include "ps/Filesystem.h"
 #include <vector>
 
 #include "scriptinterface/ScriptVal.h"
 #include "simulation2/helpers/Player.h"
 
@@ -210 +211 @@
     u32 m_FinalReplayTurn;
 };
 
 extern CGame *g_Game;
 
+// I'm not supposed to be here
+extern char g_HashDirectory[2048];
+extern FILE* g_HashFile;
+
 #endif

source/simulation2/serialization/HashSerializer.h

@@ -17 +17 @@
 
 #ifndef INCLUDED_HASHSERIALIZER
 #define INCLUDED_HASHSERIALIZER
 
 #include "BinarySerializer.h"
-
+#include "network/NetTurnManager.h"
 #include "maths/MD5.h"
+#include "ps/Game.h"
 
 class CHashSerializerImpl
 {
     // We don't care about cryptographic strength, just about detection of
     // unintended changes and about performance, so MD5 is an adequate choice
@@ -30 +31 @@
 
 public:
     size_t GetHashLength();
     const u8* ComputeHash();
 
-    void Put(const char* UNUSED(name), const u8* data, size_t len)
+    CHashSerializerImpl()
+    {
+        sprintf(g_HashDirectory, "/media/tmpfs2/oos/hash/turn_%u/", g_Game->GetTurnManager()->GetCurrentTurn());
+        CreateDirectories(g_HashDirectory, 0700);
+    }
+
+    void Put(const char* name, const u8* data, size_t len)
     {
-        m_Hash.Update(data, len);
+        if (!g_HashFile)
+        {
+            // We don't care about the RNG and next entity id field for now
+            debug_printf("Hash file not opened yet!");
+            return;
+        }
+
+        if (!name)
+        {
+            debug_printf("Bad property name\n");
+            return;
+        }
+
+        if (data)
+        {
+            fwrite(name, 1, strlen(name), g_HashFile);
+            fwrite(data, 1, len, g_HashFile);
+
+            m_Hash.Update(data, len);
+        }
+        else
+            debug_printf("Bad file or bad data\n");
     }
 
 private:
     HashFunc m_Hash;
     u8 m_HashData[HashFunc::DIGESTSIZE];

source/simulation2/system/ComponentManagerSerialization.cpp

@@ -95 +95 @@
     return true;
 }
 
 bool CComponentManager::ComputeStateHash(std::string& outHash, bool quick)
 {
+    // Always do full checks
+    quick = false;
+
     // Hash serialization: this includes the minimal data necessary to detect
     // differences in the state, and ignores things like counts and names
 
     // If 'quick' is set, this checks even fewer things, so that it will
     // be fast enough to run every turn but will typically detect any
@@ -129 +132 @@
         }
 
         if (!needsSerialization)
             continue;
 
+        // Write the data of every component to a separate file every turn
+        CStr componentName = m_ComponentTypesById.find(cit->first)->second.name;
+        char filename[2048];
+        sprintf(filename, "%s/%s", g_HashDirectory, componentName.c_str());
+        g_HashFile = fopen(filename, "wb");
         serializer.NumberI32_Unbounded("component type id", cit->first);
 
         for (std::map<entity_id_t, IComponent*>::const_iterator eit = cit->second.begin(); eit != cit->second.end(); ++eit)
         {
             // Don't serialize local entities
@@ -140 +148 @@
                 continue;
 
             serializer.NumberU32_Unbounded("entity id", eit->first);
             eit->second->Serialize(serializer);
         }
+        fclose(g_HashFile);
     }
 
     outHash = std::string((const char*)serializer.ComputeHash(), serializer.GetHashLength());
 
     // TODO: catch exceptions