Ticket #3339: t3339_command_line_option_ooslog_unique_v1.1.patch

binaries/system/readme.txt

@@ -48 +48 @@
                       PATH is system path to commands.txt containing simulation log
 -replay-visual=PATH visual replay of a previous game, used for analysis purposes
                       PATH is system path to commands.txt containing simulation log
 -writableRoot       store runtime game data in root data directory
                       (only use if you have write permissions on that directory)
+-oosdump-unique     adds unix timestamp and process id to the filename of the out of sync log
+                     to prevent the file from being overwritten by another process.
 -ooslog             dumps simulation state in binary and ASCII representations each turn,
                       files created in sim_log within the game's log folder. NOTE: game will
-                      run much slower with this option!
+                      run much slower with this option and can use hundreds of megabytes of disk space!
 -serializationtest  checks simulation state each turn for serialization errors; on test
                       failure, error is displayed and logs created in oos_log within the
                       game's log folder. NOTE: game will run much slower with this option!
 
 Windows-specific:

source/network/NetTurnManager.cpp

@@ -24 +24 @@
 #include "network/NetMessage.h"
 
 #include "gui/GUIManager.h"
 #include "maths/MathUtil.h"
 #include "ps/CLogger.h"
+#include "ps/GameSetup/CmdLineArgs.h"
 #include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/Replay.h"
 #include "ps/SavedGame.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "simulation2/Simulation2.h"
 
+#include <ctime>
 #include <sstream>
 #include <fstream>
+#include <iostream>
 #include <iomanip>
 
+#if MSC_VERSION
+#include <process.h>
+#define getpid _getpid // use the non-deprecated function name
+#endif
+
 static const int DEFAULT_TURN_LENGTH_MP = 500;
 static const int DEFAULT_TURN_LENGTH_SP = 200;
 
 static const int COMMAND_DELAY = 2;
 
@@ -228 +236 @@
 
     bool quick = !TurnNeedsFullHash(turn);
     std::string hash;
     ENSURE(m_Simulation2.ComputeStateHash(hash, quick));
 
-    OsPath path = psLogDir()/"oos_dump.txt";
+    std::wstringstream name;
+    name << L"oos_dump";
+    if (g_args.Has("oosdump-unique"))
+        name << L"_" << std::time(0) << L"_" << getpid();
+    name << L".txt";
+
+    OsPath path = psLogDir()/name.str();
     std::ofstream file (OsString(path).c_str(), std::ofstream::out | std::ofstream::trunc);
     m_Simulation2.DumpDebugState(file);
     file.close();
 
     hash = Hexify(hash);

source/network/NetTurnManager.h

@@ -23 +23 @@
 
 #include <list>
 #include <map>
 #include <vector>
 
+extern CmdLineArgs g_args;
+
 class CNetServerWorker;
 class CNetClient;
 class CSimulationMessage;
 class CSimulation2;
 class IReplayLogger;