Ticket #3966: t3966_no_empty_simlog_directories_v1.patch

source/lib/file/file_system.h

@@ -78 +78 @@
 
 LIB_API Status GetDirectoryEntries(const OsPath& path, CFileInfos* files, DirectoryNames* subdirectoryNames);
 
 // same as boost::filesystem::create_directories, except that mkdir is invoked with
 // <mode> instead of 0755.
+// If the breakpoint is enabled, debug_break will be called if the directory didn't exist and couldn't be created.
 LIB_API Status CreateDirectories(const OsPath& path, mode_t mode, bool breakpoint = true);
 
 LIB_API Status DeleteDirectory(const OsPath& dirPath);
 
 #endif  // #ifndef INCLUDED_FILE_SYSTEM

source/ps/Replay.cpp

@@ -68 +68 @@
 
     // Add engine version and currently loaded mods for sanity checks when replaying
     m_ScriptInterface.SetProperty(attribs, "engine_version", CStr(engine_version));
     m_ScriptInterface.SetProperty(attribs, "mods", g_modsLoaded);
 
-    m_Directory = getDateIndexSubdirectory(VisualReplay::GetDirectoryName());
+    m_Directory = createDateIndexSubdirectory(VisualReplay::GetDirectoryName());
     debug_printf("Writing replay to %s\n", m_Directory.string8().c_str());
 
     m_Stream = new std::ofstream(OsString(m_Directory / L"commands.txt").c_str(), std::ofstream::out | std::ofstream::trunc);
     *m_Stream << "start " << m_ScriptInterface.StringifyJSON(attribs, false) << "\n";
 }

source/ps/Util.cpp

@@ -194 +194 @@
 }
 
 /**
  * Return an unused directory, based on date and index (for example 2016-02-09_0001)
  */
-OsPath getDateIndexSubdirectory(const OsPath& parentDir)
+OsPath createDateIndexSubdirectory(const OsPath& parentDir)
 {
     const std::time_t timestamp = std::time(nullptr);
     const struct std::tm* now = std::localtime(&timestamp);
 
     // Two processes executing this simultaneously might attempt to create the same directory.

source/ps/Util.h

@@ -24 +24 @@
 
 extern void WriteSystemInfo();
 
 extern const wchar_t* ErrorString(int err);
 
-extern OsPath getDateIndexSubdirectory(const OsPath& parentDir);
+extern OsPath createDateIndexSubdirectory(const OsPath& parentDir);
 
 extern void WriteScreenshot(const VfsPath& extension);
 extern void WriteBigScreenshot(const VfsPath& extension, int tiles);
 
 extern Status tex_write(Tex* t, const VfsPath& filename);

source/simulation2/Simulation2.cpp

@@ -74 +74 @@
         {
             CFG_GET_VAL("ooslog", m_EnableOOSLog);
             CFG_GET_VAL("serializationtest", m_EnableSerializationTest);
         }
 
-        m_OOSLogPath = getDateIndexSubdirectory(psLogDir() / "oos_logs");
-
         if (m_EnableOOSLog)
+        {
+            m_OOSLogPath = createDateIndexSubdirectory(psLogDir() / "oos_logs");
             debug_printf("Writing ooslogs to %s\n", m_OOSLogPath.string8().c_str());
+        }
     }
 
     ~CSimulation2Impl()
     {
         UnregisterFileReloadFunc(ReloadChangedFileCB, this);
@@ -294 +295 @@
 
 void CSimulation2Impl::ReportSerializationFailure(
     SerializationTestState* primaryStateBefore, SerializationTestState* primaryStateAfter,
     SerializationTestState* secondaryStateBefore, SerializationTestState* secondaryStateAfter)
 {
-    const OsPath path = getDateIndexSubdirectory(psLogDir() / "serializationtest");
+    const OsPath path = createDateIndexSubdirectory(psLogDir() / "serializationtest");
     debug_printf("Writing serializationtest-data to %s\n", path.string8().c_str());
 
     // Clean up obsolete files from previous runs
     wunlink(path / "hash.before.a");
     wunlink(path / "hash.before.b");
@@ -553 +554 @@
     std::stringstream name;\
     name << std::setw(5) << std::setfill('0') << m_TurnNumber << ".txt";
     const OsPath path = m_OOSLogPath / name.str();
     std::ofstream file (OsString(path).c_str(), std::ofstream::out | std::ofstream::trunc);
 
+    if (!DirectoryExists(m_OOSLogPath))
+    {
+        LOGWARNING("OOS-log directory %s was deleted, creating it again.", m_OOSLogPath.string8().c_str());
+        CreateDirectories(m_OOSLogPath, 0700);
+    }
+
     file << "State hash: " << std::hex;
     std::string hashRaw;
     m_ComponentManager.ComputeStateHash(hashRaw, false);
     for (size_t i = 0; i < hashRaw.size(); ++i)
         file << std::setfill('0') << std::setw(2) << (int)(unsigned char)hashRaw[i];
@@ -588 +595 @@
 {
     if (m->m_EnableOOSLog)
         return;
 
     m->m_EnableOOSLog = true;
+    m->m_OOSLogPath = createDateIndexSubdirectory(psLogDir() / "oos_logs");
+
     debug_printf("Writing ooslogs to %s\n", m->m_OOSLogPath.string8().c_str());
 }
 
 void CSimulation2::EnableSerializationTest()
 {