Reset TLS on Profiling Entrance

libkineto/include/ThreadUtil.h

@@ -27,4 +27,8 @@ std::string processName(int32_t pid);
 // and its parents.
 std::vector<std::pair<int32_t, std::string>> pidCommandPairsOfAncestors();
 
+// Resets all cached Thread local state, this must be done on
+// forks to prevent stale values from being retained.
+void resetTLS();
+
 } // namespace libkineto

libkineto/include/libkineto.h

@@ -117,6 +117,10 @@ class LibkinetoApi {
     suppressLibkinetoLogMessages();
   }
 
+  void resetKinetoTLS() {
+    resetTLS();
+  }
+
   // Provides access to profier configuration manaegement
   ConfigLoader& configLoader() {
     return configLoader_;

libkineto/src/ActivityProfilerProxy.cpp

@@ -12,6 +12,7 @@
 #include "ActivityProfilerController.h"
 #include "Config.h"
 #include "Logger.h"
+#include "ThreadUtil.h"
 
 namespace KINETO_NAMESPACE {
 
@@ -31,6 +32,7 @@ void ActivityProfilerProxy::init() {
 }
 
 void ActivityProfilerProxy::scheduleTrace(const std::string& configStr) {
+  resetTLS();
   Config config;
   config.parse(configStr);
   controller_->scheduleTrace(config);

libkineto/src/ConfigLoader.cpp

@@ -172,7 +172,9 @@ void ConfigLoader::stopThread() {
       std::lock_guard<std::mutex> lock(updateThreadMutex_);
       updateThreadCondVar_.notify_one();
     }
-    updateThread_->join();
+    if (updateThread_->joinable()) {
+      updateThread_->join();
+    }
     updateThread_ = nullptr;
   }
 }

libkineto/src/ThreadUtil.cpp

@@ -92,6 +92,14 @@ int32_t threadId() {
   return _tid;
 }
 
+// Resets all cached Thread local state, this must be done on
+// forks to prevent stale values from being retained.
+void resetTLS() {
+  _pid = 0;
+  _tid = 0;
+  _sysTid = 0;
+}
+
 namespace {
 static constexpr size_t kMaxThreadNameLength = 16;
 

libkineto/src/init.cpp

@@ -16,6 +16,7 @@
 #include "ConfigLoader.h"
 #include "DaemonConfigLoader.h"
 #include "DeviceUtil.h"
+#include "ThreadUtil.h"
 #ifdef HAS_CUPTI
 #include "CuptiActivityApi.h"
 #include "CuptiCallbackApi.h"