Create file with unique name to dump usage metrics (Xilinx#7831)

* Create file with unique name to dump usage metrics Signed-off-by: rbramand <[email protected]> * Address comments on PR Signed-off-by: rbramand <[email protected]> --------- Signed-off-by: rbramand <[email protected]> Co-authored-by: rbramand <[email protected]>
Xilinx · Dec 5, 2023 · 8eefcb7 · 8eefcb7
1 parent 7b819f0
commit 8eefcb7
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/src/runtime_src/core/common/message.cpp b/src/runtime_src/core/common/message.cpp
@@ -34,25 +34,13 @@
 # include <linux/limits.h>
 # include <sys/stat.h>
 # include <sys/types.h>
-#include <unistd.h>
 #endif
 #ifdef _WIN32
-# include <process.h>
 # include <winsock.h>
 #endif
 
 namespace {
 
-static int
-get_processid()
-{
-#ifdef _WIN32
-  return _getpid();
-#else
-  return getpid();
-#endif
-}
-
 static unsigned int
 get_userid()
 {
@@ -206,7 +194,7 @@ file_dispatch(const std::string &file)
   handle << "Build date: " << xrt_build_version_date << "\n";
   handle << "Git branch: " << xrt_build_version_branch<< "\n";
   handle << "[" << xrt_core::timestamp() << "]" << "\n";
-  handle << "PID: " << get_processid() << "\n";
+  handle << "PID: " << xrt_core::utils::get_pid() << "\n";
   handle << "UID: " << get_userid() << "\n";
   handle << "HOST: " <<  xrt_core::utils::get_hostname() << "\n";
   handle << "EXE: " << get_exe_path() << std::endl;
@@ -235,7 +223,7 @@ console_dispatch()
   std::cerr << "Build hash: " << xrt_build_version_hash << "\n";
   std::cerr << "Build date: " << xrt_build_version_date << "\n";
   std::cerr << "Git branch: " << xrt_build_version_branch<< "\n";
-  std::cerr << "PID: " << get_processid() << "\n";
+  std::cerr << "PID: " << xrt_core::utils::get_pid() << "\n";
   std::cerr << "UID: " << get_userid() << "\n";
   std::cerr << "[" << xrt_core::timestamp() << "]\n";
   std::cerr << "HOST: " << xrt_core::utils::get_hostname() << "\n";

diff --git a/src/runtime_src/core/common/usage_metrics.cpp b/src/runtime_src/core/common/usage_metrics.cpp
@@ -13,6 +13,7 @@
 #include "core/common/query_requests.h"
 #include "core/common/shim/buffer_handle.h"
 #include "core/common/shim/hwctx_handle.h"
+#include "core/common/utils.h"
 #include "core/include/xrt/xrt_uuid.h"
 
 #include <algorithm>
@@ -173,7 +174,8 @@ print_json(const bpt::ptree& pt)
   time_stamp << std::put_time(std::localtime(&time), "%Y-%m-%d_%H-%M-%S");
 
   // create json in pwd
-  std::string file_name{"XRT_usage_metrics_" + time_stamp.str() + ".json"};
+  // file name format - XRT_usage_metrics_##pid_YY-MM-DD_H-M-S.json
+  std::string file_name{"XRT_usage_metrics_" + std::to_string(xrt_core::utils::get_pid()) + "_" + time_stamp.str() + ".json"};
   std::ofstream out_file{file_name};
 
   if (out_file.is_open()) {

diff --git a/src/runtime_src/core/common/utils.cpp b/src/runtime_src/core/common/utils.cpp
@@ -28,6 +28,13 @@
 #include <string>
 #include <boost/algorithm/string.hpp>
 
+#ifdef __linux__
+# include <unistd.h>
+#endif
+#ifdef _WIN32
+# include <process.h>
+#endif
+
 namespace {
 
 inline unsigned int
@@ -325,4 +332,14 @@ value_to_mac_addr(const uint64_t mac_addr_value)
   return mac_addr;
 }
 
+int
+get_pid()
+{
+#ifdef _WIN32
+  return _getpid();
+#else
+  return getpid();
+#endif
+}
+
 }} // utils, xrt_core
diff --git a/src/runtime_src/core/common/utils.h b/src/runtime_src/core/common/utils.h
@@ -129,6 +129,10 @@ XRT_CORE_COMMON_EXPORT
 std::string
 value_to_mac_addr(const uint64_t mac_addr_value);
 
+XRT_CORE_COMMON_EXPORT
+int
+get_pid();
+
 }} // utils, xrt_core
 
 #endif