Merge pull request #2083 from kswiecicki/xpti-init-fix

Fix XPTI initialization bug
oneapi-src · Sep 12, 2024 · ea5037c · ea5037c
1 parent 637344c
commit ea5037c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/source/loader/layers/tracing/ur_tracing_layer.cpp b/source/loader/layers/tracing/ur_tracing_layer.cpp
@@ -34,14 +34,15 @@ struct XptiContextManager {
     ~XptiContextManager() { xptiFrameworkFinalize(); }
 };
 
-static std::shared_ptr<XptiContextManager> xptiContextManagerGlobal = [] {
-    return std::make_shared<XptiContextManager>();
-}();
+static std::shared_ptr<XptiContextManager> xptiContextManagerGet() {
+    static auto contextManager = std::make_shared<XptiContextManager>();
+    return contextManager;
+};
 static thread_local xpti_td *activeEvent;
 
 ///////////////////////////////////////////////////////////////////////////////
 context_t::context_t() : logger(logger::create_logger("tracing", true, true)) {
-    this->xptiContextManager = xptiContextManagerGlobal;
+    this->xptiContextManager = xptiContextManagerGet();
 
     call_stream_id = xptiRegisterStream(CALL_STREAM_NAME);
     std::ostringstream streamv;