Tracing: Create leading directories if they don't exist (#35668)

project-chip · Sep 19, 2024 · afb1a33 · afb1a33
1 parent 7862cb3
commit afb1a33
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/controller/python/chip/tracing/TracingSetup.cpp b/src/controller/python/chip/tracing/TracingSetup.cpp
@@ -34,7 +34,7 @@ chip::Tracing::Perfetto::PerfettoBackend gPerfettoBackend;
 
 } // namespace
 
-extern "C" void pychip_tracing_start_json_log(const char * file_name)
+extern "C" void pychip_tracing_start_json_log()
 {
     chip::MainLoopWork::ExecuteInMainLoop([] {
         gJsonBackend.CloseFile(); // just in case, ensure no file output

diff --git a/src/controller/python/chip/tracing/__init__.py b/src/controller/python/chip/tracing/__init__.py
@@ -115,9 +115,6 @@ def StartFromString(self, destination: str):
         else:
             raise ValueError("Invalid trace-to destination: %r", destination)
 
-    def __init__(self):
-        pass
-
     def __enter__(self):
         return self
 

diff --git a/src/tracing/json/json_tracing.cpp b/src/tracing/json/json_tracing.cpp
@@ -31,6 +31,7 @@
 
 #include <errno.h>
 
+#include <filesystem>
 #include <sstream>
 #include <string>
 
@@ -461,8 +462,16 @@ void JsonBackend::CloseFile()
 CHIP_ERROR JsonBackend::OpenFile(const char * path)
 {
     CloseFile();
-    mOutputFile.open(path, std::ios_base::out);
 
+    std::error_code ec;
+    std::filesystem::path filePath(path);
+    // Create directories if they don't exist
+    if (!std::filesystem::create_directories(filePath.remove_filename(), ec))
+    {
+        return CHIP_ERROR_POSIX(ec.value());
+    }
+
+    mOutputFile.open(path, std::ios_base::out);
     if (!mOutputFile)
     {
         return CHIP_ERROR_POSIX(errno);

diff --git a/src/tracing/perfetto/file_output.cpp b/src/tracing/perfetto/file_output.cpp
@@ -24,6 +24,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <filesystem>
 
 namespace chip {
 namespace Tracing {
@@ -37,6 +38,14 @@ CHIP_ERROR FileTraceOutput::Open(const char * file_name)
     // Close any existing files
     Close();
 
+    std::error_code ec;
+    std::filesystem::path filePath(file_name);
+    // Create directories if they don't exist
+    if (!std::filesystem::create_directories(filePath.remove_filename(), ec))
+    {
+        return CHIP_ERROR_POSIX(ec.value());
+    }
+
     // Create a trace file and start sending data to it
     mTraceFileId = open(file_name, O_RDWR | O_CREAT | O_TRUNC, 0640);
     if (mTraceFileId < 0)