Ticket #3255: t3255_use_datetime_in_simlog_directory_v2.patch

source/ps/Replay.cpp

@@ -31 +31 @@
 #include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/ScriptStats.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/helpers/SimulationCommand.h"
 
+#include <ctime>
 #include <sstream>
 #include <fstream>
 #include <iomanip>
 
-#if MSC_VERSION
-#include <process.h>
-#define getpid _getpid // use the non-deprecated function name
-#endif
-
 static std::string Hexify(const std::string& s)
 {
     std::stringstream str;
     str << std::hex;
     for (size_t i = 0; i < s.size(); ++i)
@@ -52 +48 @@
 }
 
 CReplayLogger::CReplayLogger(ScriptInterface& scriptInterface) :
     m_ScriptInterface(scriptInterface)
 {
-    // Construct the directory name based on the PID, to be relatively unique.
-    // Append "-1", "-2" etc if we run multiple matches in a single session,
-    // to avoid accidentally overwriting earlier logs.
-
-    std::wstringstream name;
-    name << getpid();
-
-    static int run = -1;
-    if (++run)
-        name << "-" << run;
+    // Get current date
+    time_t t = time(NULL);
+    struct tm* now = localtime(&t);
+    char date[12];
+    sprintf_s(date, ARRAY_SIZE(date), "%04d-%02d-%02d_", 1900+now->tm_year, 1+now->tm_mon, now->tm_mday);
+
+    // Construct a unique directory name based on date and sequential number per date
+    int i = 1;
+    OsPath path;
+    std::stringstream pathname;
+    do
+    {
+        pathname.str("");
+        pathname.clear();
+        pathname << date << i++;
+        path = psLogDir() / L"sim_log" / pathname.str() / L"commands.txt";
+    } while(DirectoryExists(path.Parent()));
 
-    OsPath path = psLogDir() / L"sim_log" / name.str() / L"commands.txt";
+    // Create directory and commands.txt
     CreateDirectories(path.Parent(), 0700);
     m_Stream = new std::ofstream(OsString(path).c_str(), std::ofstream::out | std::ofstream::trunc);
 }
 
 CReplayLogger::~CReplayLogger()