Fix issue where all databases have the same UUID (#1499)

adjordje-amd · Aleksandar Djordjevic · web-flow · commit a96489ef95ec · 2025-10-22T12:05:46.000+02:00
Co-authored-by: Aleksandar Djordjevic &lt;adjordje@amd.com&gt;
diff --git a/projects/rocprofiler-systems/source/lib/core/rocpd/data_processor.cpp b/projects/rocprofiler-systems/source/lib/core/rocpd/data_processor.cpp
@@ -39,7 +39,7 @@ data_processor::data_processor(std::shared_ptr<data_storage::database> database)
         throw std::invalid_argument("Provided pointer to a non-existing database!");
     }
     _database->initialize_schema();
-    _upid = data_storage::database::get_upid();
+    _upid = _database->get_upid();
 
     initialize_event_stmt();
     initialize_pmc_event_stmt();
diff --git a/projects/rocprofiler-systems/source/lib/core/rocpd/data_processor.hpp b/projects/rocprofiler-systems/source/lib/core/rocpd/data_processor.hpp
@@ -26,9 +26,7 @@
 #include <cstdint>
 #include <functional>
 #include <memory>
-#include <mutex>
 #include <optional>
-#include <set>
 #include <string>
 #include <unordered_map>
 
diff --git a/projects/rocprofiler-systems/source/lib/core/rocpd/data_storage/database.cpp b/projects/rocprofiler-systems/source/lib/core/rocpd/data_storage/database.cpp
@@ -51,8 +51,9 @@ namespace rocpd
 {
 namespace data_storage
 {
-database::database(const std::string& _tag)
+database::database(int pid, int ppid)
 {
+    auto _tag        = std::to_string(pid);
     auto db_name     = std::string{ "rocpd" };
     auto abs_db_path = rocprofsys::get_database_absolute_path(db_name, _tag);
     create_directory_for_database_file(abs_db_path);
@@ -62,6 +63,7 @@ database::database(const std::string& _tag)
                             "database open failed!");
     validate_sqlite3_result(sqlite3_open(abs_db_path.c_str(), &_sqlite3_db), "",
                             "database open failed!");
+    m_upid = generate_upid(pid, ppid);
 }
 
 database::~database()
@@ -114,8 +116,10 @@ database::initialize_schema()
         std::regex guid_pattern("\\{\\{guid\\}\\}");
         std::regex view_upid_pattern("\\{\\{view_upid\\}\\}");
 
-        query = std::regex_replace(query, upid_pattern, "_" + get_upid());
-        query = std::regex_replace(query, guid_pattern, get_upid());
+        auto upid = get_upid();
+
+        query = std::regex_replace(query, upid_pattern, "_" + upid);
+        query = std::regex_replace(query, guid_pattern, upid);
         query = std::regex_replace(query, view_upid_pattern, "");
 
         validate_sqlite3_result(
@@ -135,12 +139,15 @@ database::execute_query(const std::string& query)
 std::string
 database::get_upid()
 {
-    static std::string _upid = []() {
-        auto n_info = node_info::get_instance();
-        auto guid   = common::md5sum{ n_info.id, getpid(), getppid() };
-        return guid.hexdigest();
-    }();
-    return _upid;
+    return m_upid;
+}
+
+std::string
+database::generate_upid(const int pid, const int ppid)
+{
+    auto n_info = node_info::get_instance();
+    auto guid   = common::md5sum{ n_info.id, pid, ppid };
+    return guid.hexdigest();
 }
 
 size_t
diff --git a/projects/rocprofiler-systems/source/lib/core/rocpd/data_storage/database.hpp b/projects/rocprofiler-systems/source/lib/core/rocpd/data_storage/database.hpp
@@ -38,7 +38,7 @@ static std::mutex _mutex;
 class database
 {
 public:
-    explicit database(const std::string& _tag);
+    explicit database(int pid, int ppid);
     database()                      = delete;
     database(database&)             = delete;
     database& operator=(database&)  = delete;
@@ -51,8 +51,8 @@ class database
 
 private:
     template <typename... Args>
-    inline void validate_sqlite3_result(int sqlite3_error_code, const char* query,
-                                        Args&&... args)
+    void validate_sqlite3_result(int sqlite3_error_code, const char* query,
+                                 Args&&... args)
     {
         std::stringstream ss;
         ss << "\n===========================================================\n";
@@ -112,17 +112,16 @@ class database
                                              std::is_same_v<std::decay_t<T>, int32_t> ||
                                              std::is_same_v<std::decay_t<T>, uint32_t>),
                                            int> = 0>
-    inline void bind_value([[maybe_unused]] sqlite3_stmt* stmt,
-                           [[maybe_unused]] int position, [[maybe_unused]] T& _value,
-                           [[maybe_unused]] const std::string& query)
+    void bind_value([[maybe_unused]] sqlite3_stmt* stmt, [[maybe_unused]] int position,
+                    [[maybe_unused]] T& _value, [[maybe_unused]] const std::string& query)
     {
         throw std::runtime_error("Unsupported type for binding!");
     }
 
     template <typename T,
               std::enable_if_t<common::traits::is_string_literal<T>(), int> = 0>
-    inline void bind_value(sqlite3_stmt* stmt, int position, T&& _value,
-                           const std::string& query)
+    void bind_value(sqlite3_stmt* stmt, int position, T&& _value,
+                    const std::string& query)
     {
         validate_sqlite3_result(
             sqlite3_bind_text(stmt, position, _value, -1, SQLITE_STATIC), query.c_str(),
@@ -131,8 +130,8 @@ class database
 
     template <typename T,
               std::enable_if_t<std::is_floating_point_v<std::decay_t<T>>, int> = 0>
-    inline void bind_value(sqlite3_stmt* stmt, int position, T&& _value,
-                           const std::string& query)
+    void bind_value(sqlite3_stmt* stmt, int position, T&& _value,
+                    const std::string& query)
     {
         validate_sqlite3_result(
             sqlite3_bind_double(stmt, position, _value), query.c_str(),
@@ -142,8 +141,8 @@ class database
     template <typename T, std::enable_if_t<std::is_same_v<std::decay_t<T>, int64_t> ||
                                                std::is_same_v<std::decay_t<T>, uint64_t>,
                                            int> = 0>
-    inline void bind_value(sqlite3_stmt* stmt, int position, T&& _value,
-                           const std::string& query)
+    void bind_value(sqlite3_stmt* stmt, int position, T&& _value,
+                    const std::string& query)
     {
         validate_sqlite3_result(sqlite3_bind_int64(stmt, position, _value), query.c_str(),
                                 "Failed to bind int64_t/uint64_t! Position: ", position,
@@ -153,8 +152,8 @@ class database
     template <typename T, std::enable_if_t<std::is_same_v<std::decay_t<T>, int32_t> ||
                                                std::is_same_v<std::decay_t<T>, uint32_t>,
                                            int> = 0>
-    inline void bind_value(sqlite3_stmt* stmt, int position, T&& _value,
-                           const std::string& query)
+    void bind_value(sqlite3_stmt* stmt, int position, T&& _value,
+                    const std::string& query)
     {
         validate_sqlite3_result(sqlite3_bind_int(stmt, position, _value), query.c_str(),
                                 "Failed to bind int32_t/uint32_t! Position: ", position,
@@ -194,11 +193,16 @@ class database
         };
     }
 
-    static std::string get_upid();
+    std::string get_upid();
 
 private:
-    sqlite3* _sqlite3_db{ nullptr };
-    sqlite3* _sqlite3_db_temp{ nullptr };
+    static std::string generate_upid(const int pid, const int ppid);
+
+private:
+    sqlite3*    _sqlite3_db{ nullptr };
+    sqlite3*    _sqlite3_db_temp{ nullptr };
+    std::string m_tag;
+    std::string m_upid;
 };
 
 }  // namespace data_storage
diff --git a/projects/rocprofiler-systems/source/lib/core/trace_cache/cache_manager.cpp b/projects/rocprofiler-systems/source/lib/core/trace_cache/cache_manager.cpp
@@ -30,7 +30,6 @@
 #include "trace_cache/metadata_registry.hpp"
 #include "trace_cache/rocpd_post_processing.hpp"
 #include <algorithm>
-#include <iterator>
 #include <memory>
 #include <vector>
 
@@ -46,8 +45,7 @@ list_dir_files(const std::string& path)
     DIR* dir = opendir(path.c_str());
     if(dir == nullptr)
     {
-        std::cerr << "Error opening directory: " << path << std::endl;
-        return {};
+        ROCPROFSYS_THROW("Error opening directory: %s", path.c_str());
     }
 
     std::vector<std::string> result{};
@@ -140,8 +138,10 @@ cache_manager::post_process_bulk()
             ROCPROFSYS_SCOPED_SAMPLING_ON_CHILD_THREADS(false);
 
             rocpd_threads.emplace_back([this]() {
+                auto                  pid  = getpid();
+                auto                  ppid = get_root_process_id();
                 rocpd_post_processing _post_processing(
-                    m_metadata, get_agent_manager_instance(), std::to_string(getpid()));
+                    m_metadata, get_agent_manager_instance(), pid, ppid);
                 storage_parser _parser(
                     get_buffered_storage_filename(get_root_process_id(), getpid()));
                 _post_processing.register_parser_callback(_parser);
@@ -172,8 +172,9 @@ cache_manager::post_process_bulk()
                         }
 
                         agent_manager         _agent_manager{ _agents };
+                        auto                  ppid = get_root_process_id();
                         rocpd_post_processing _post_processing(_metadata, _agent_manager,
-                                                               std::to_string(pid));
+                                                               pid, ppid);
                         storage_parser        _parser(files.buff_storage);
                         _post_processing.register_parser_callback(_parser);
                         _post_processing.post_process_metadata();
diff --git a/projects/rocprofiler-systems/source/lib/core/trace_cache/rocpd_post_processing.cpp b/projects/rocprofiler-systems/source/lib/core/trace_cache/rocpd_post_processing.cpp
@@ -56,7 +56,7 @@ auto
 get_handle_from_code_object(
     const rocprofiler_callback_tracing_code_object_load_data_t& code_object)
 {
-#    if(ROCPROFILER_VERSION >= 600)
+#    if (ROCPROFILER_VERSION >= 600)
     return code_object.agent_id.handle;
 #    else
     return code_object.rocp_agent.handle;
@@ -164,7 +164,7 @@ rocpd_post_processing::get_memory_copy_callback() const
     };
 }
 
-#if(ROCPROFSYS_USE_ROCM > 0 && ROCPROFILER_VERSION >= 600)
+#if (ROCPROFSYS_USE_ROCM > 0 && ROCPROFILER_VERSION >= 600)
 postprocessing_callback
 rocpd_post_processing::get_memory_allocate_callback() const
 {
@@ -660,12 +660,11 @@ rocpd_post_processing::get_cpu_freq_sample_callback() const
 }
 
 rocpd_post_processing::rocpd_post_processing(metadata_registry& md,
-                                             agent_manager&     agent_mngr,
-                                             const std::string& _database_tag)
+                                             agent_manager& agent_mngr, int pid, int ppid)
 : m_metadata(md)
 , m_agent_manager(agent_mngr)
 , m_data_processor(std::make_shared<rocpd::data_processor>(
-      std::make_shared<rocpd::data_storage::database>(_database_tag)))
+      std::make_shared<rocpd::data_storage::database>(pid, ppid)))
 {}
 
 void
@@ -680,7 +679,7 @@ rocpd_post_processing::register_parser_callback([[maybe_unused]] storage_parser&
     parser.register_type_callback(entry_type::kernel_dispatch,
                                   get_kernel_dispatch_callback());
     parser.register_type_callback(entry_type::memory_copy, get_memory_copy_callback());
-#    if(ROCPROFILER_VERSION >= 600)
+#    if (ROCPROFILER_VERSION >= 600)
     parser.register_type_callback(entry_type::memory_alloc,
                                   get_memory_allocate_callback());
 #    endif
diff --git a/projects/rocprofiler-systems/source/lib/core/trace_cache/rocpd_post_processing.hpp b/projects/rocprofiler-systems/source/lib/core/trace_cache/rocpd_post_processing.hpp
@@ -35,8 +35,8 @@ namespace trace_cache
 class rocpd_post_processing
 {
 public:
-    rocpd_post_processing(metadata_registry& metadata, agent_manager& agent_mngr,
-                          const std::string& _database_tag);
+    rocpd_post_processing(metadata_registry& metadata, agent_manager& agent_mngr, int pid,
+                          int ppid);
 
     void register_parser_callback(storage_parser& parser);
     void post_process_metadata();
@@ -51,7 +51,7 @@ class rocpd_post_processing
 
     postprocessing_callback get_kernel_dispatch_callback() const;
     postprocessing_callback get_memory_copy_callback() const;
-#if(ROCPROFILER_VERSION >= 600)
+#if (ROCPROFILER_VERSION >= 600)
     postprocessing_callback get_memory_allocate_callback() const;
 #endif
     postprocessing_callback get_region_callback() const;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ data_processor::data_processor(std::shared_ptr<data_storage::database> database)`
`39`	`39`	`throw std::invalid_argument("Provided pointer to a non-existing database!");`
`40`	`40`	`}`
`41`	`41`	`_database->initialize_schema();`
`42`		`- _upid = data_storage::database::get_upid();`
	`42`	`+ _upid = _database->get_upid();`
`43`	`43`
`44`	`44`	`initialize_event_stmt();`
`45`	`45`	`initialize_pmc_event_stmt();`