From 01c95224d1c34c6e9d0cde8d7428309e915ae589 Mon Sep 17 00:00:00 2001
From: Eddie Yan <eddiey@nvidia.com>
Date: Sat, 31 Aug 2024 00:04:53 +0000
Subject: [PATCH] check in

---
 libkineto/include/Config.h | 4 ++++
 libkineto/src/Config.cpp   | 4 +++-
 libkineto/src/init.cpp     | 8 +++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/libkineto/include/Config.h b/libkineto/include/Config.h
index eba4f3c90..03db539d4 100644
--- a/libkineto/include/Config.h
+++ b/libkineto/include/Config.h
@@ -502,4 +502,8 @@ class Config : public AbstractConfig {
 
 constexpr char kUseDaemonEnvVar[] = "KINETO_USE_DAEMON";
 
+#if __linux__
+extern int kUseDaemonEnvVarSet;
+#endif
+
 } // namespace libkineto
diff --git a/libkineto/src/Config.cpp b/libkineto/src/Config.cpp
index 346f910ec..b4947820c 100644
--- a/libkineto/src/Config.cpp
+++ b/libkineto/src/Config.cpp
@@ -8,6 +8,7 @@
 
 #include "Config.h"
 
+#include <assert.h>
 #include <stdlib.h>
 
 #include <fmt/chrono.h>
@@ -243,7 +244,8 @@ Config::Config()
     factories->addFeatureConfigs(*this);
   }
 #if __linux__
-  enableIpcFabric_ = (getenv(kUseDaemonEnvVar) != nullptr);
+  assert(libkineto::kUseDaemonEnvVarSet >= 0);
+  enableIpcFabric_ = libkineto::kUseDaemonEnvVarSet;
 #endif
 }
 
diff --git a/libkineto/src/init.cpp b/libkineto/src/init.cpp
index 55ef76b33..0494ea106 100644
--- a/libkineto/src/init.cpp
+++ b/libkineto/src/init.cpp
@@ -31,6 +31,10 @@
 #include "Logger.h"
 
 namespace KINETO_NAMESPACE {
+#if __linux__
+int kUseDaemonEnvVarSet = -1;
+#endif
+
 
 #if __linux__ || defined(HAS_CUPTI)
 static bool initialized = false;
@@ -131,7 +135,9 @@ void libkineto_init(bool cpuOnly, bool logOnError) {
 
   // Factory to connect to open source daemon if present
 #if __linux__
-  if (getenv(kUseDaemonEnvVar) != nullptr) {
+  void *ptr = getenv(kUseDaemonEnvVar);
+  libkineto::kUseDaemonEnvVarSet = ptr != nullptr;
+  if (libkineto::kUseDaemonEnvVarSet) {
     LOG(INFO) << "Registering daemon config loader, cpuOnly =  "
               << cpuOnly;
     DaemonConfigLoader::registerFactory();