c: add object format, update unit tests

flux-framework · Apr 16, 2024 · e010649 · e010649
1 parent 55d9fa0
commit e010649
Show file tree

Hide file tree

Showing 2 changed files with 126 additions and 95 deletions.
diff --git a/src/c/runtime/advice_chrome_tracing.cpp b/src/c/runtime/advice_chrome_tracing.cpp
@@ -204,16 +204,38 @@ int advice_chrome_tracing_t::flush_if(size_t size)
         }
         m_oss.seekp(0, std::ios::end);
         std::stringstream::pos_type offset = m_oss.tellp();
-        if (offset >= size)
+        if (m_array_format)
         {
-            if (!m_ofs.is_open())
+            if (offset >= size)
             {
-                m_ofs.open(m_fn, std::ofstream::out);
-                m_ofs << "[" << std::endl;
+                if (!m_ofs.is_open())
+                {
+                    m_ofs.open(m_fn, std::ofstream::out);
+                    m_ofs << "[" << std::endl;
+                }
+                m_ofs << m_oss.str();
+                m_oss.str("");
+                m_oss.clear();
+            }
+        }
+        else
+        {
+            if (offset >= size)
+            {
+                if (!m_ofs.is_open())
+                {
+                    m_ofs.open(m_fn, std::ofstream::out);
+                    m_ofs << "{" << std::endl;
+                    m_ofs << "  \"displayTimeUnit\": \"us\"," << std::endl;
+                    m_ofs << "  \"otherData\": {" << std::endl;
+                    m_ofs << "" << std::endl;
+                    m_ofs << "  }," << std::endl;
+                    m_ofs << "  \"traceEvents\": [" << std::endl;
+                }
+                m_ofs << m_oss.str();
+                m_oss.str("");
+                m_oss.clear();
             }
-            m_ofs << m_oss.str();
-            m_oss.str("");
-            m_oss.clear();
         }
         if ((rc = pthread_mutex_unlock(&m_mutex)) < 0)
         {
@@ -476,6 +498,26 @@ advice_chrome_tracing_t::advice_chrome_tracing_t ()
                                 "gethostname failed");
 
     m_fn = "perfflow";
+
+    std::string log_format = m_perfflow_options["log-format"];
+    if (log_format == "Array" || log_format == "array" || log_format == "ARRAY")
+    {
+        m_array_format = 1;
+        m_fn += ".array";
+    }
+    else if (log_format == "Object" || log_format == "object" ||
+             log_format == "OBJECT")
+    {
+        m_array_format = 0;
+        m_fn += ".object";
+    }
+    else
+    {
+        throw std::system_error(errno,
+                                std::system_category(),
+                                "invalid log-format value");
+    }
+
     for (auto &inc : include_list)
     {
         if (inc == "name")
@@ -496,23 +538,6 @@ advice_chrome_tracing_t::advice_chrome_tracing_t ()
         }
     }
 
-    std::string log_format = m_perfflow_options["log-format"];
-    if (log_format == "Array" || log_format == "array" || log_format == "ARRAY")
-    {
-        m_array_format = 1;
-    }
-    else if (log_format == "Object" || log_format == "object" ||
-             log_format == "OBJECT")
-    {
-        m_array_format = 0;
-    }
-    else
-    {
-        throw std::system_error(errno,
-                                std::system_category(),
-                                "invalid log-format value");
-    }
-
     m_fn += ".pfw";
 
     std::string log_dir = m_perfflow_options["log-dir"];