Don't Allow Profiling Thread to pick up wrong config (#1076)

Summary:

Now that we have two types of on-demand threads accepting requests (GPU Traces + Memory Snapshots) we need to lock out one thread from using another's request. Right now there is a possibility that a user does memory profiling then gpu trace profiling which will cause the second trace to be invalid.

NOTE: To get both types of requests working in a single run, we will need a follow up diff in which both threads can be instantiated and tracked. Currently, if we make one type of thread, we lock out the other. This diff is an incremental step towards getting both to work.

Differential Revision: D72980123

Author: sraikund16

libkineto/src/ActivityProfilerController.cpp

@@ -146,6 +146,9 @@ bool ActivityProfilerController::shouldActivateTimestampConfig(
   if (asyncRequestConfig_->hasProfileStartIteration()) {
     return false;
   }
+  if (asyncRequestConfig_->memoryProfilerEnabled()) {
+    return false;
+  }
   // Note on now + Config::kControllerIntervalMsecs:
   // Profiler interval does not align perfectly up to startTime - warmup.
   // Waiting until the next tick won't allow sufficient time for the profiler to
@@ -168,6 +171,9 @@ bool ActivityProfilerController::shouldActivateIterationConfig(
   if (!asyncRequestConfig_->hasProfileStartIteration()) {
     return false;
   }
+  if (asyncRequestConfig_->memoryProfilerEnabled()) {
+    return false;
+  }
   auto rootIter = asyncRequestConfig_->startIterationIncludingWarmup();
   // Keep waiting, it is not time to start yet.
   if (currentIter < rootIter) {
@@ -252,7 +258,8 @@ void ActivityProfilerController::memoryProfilerLoop() {
     // Perform Double-checked locking to reduce overhead of taking lock.
     if (asyncRequestConfig_ && !profiler_->isActive()) {
       std::lock_guard<std::mutex> lock(asyncConfigLock_);
-      if (asyncRequestConfig_ && !profiler_->isActive()) {
+      if (asyncRequestConfig_ && !profiler_->isActive() &&
+          asyncRequestConfig_->memoryProfilerEnabled()) {
         logger_ = makeLogger(*asyncRequestConfig_);
         path = asyncRequestConfig_->activitiesLogFile();
         profile_time = asyncRequestConfig_->profileMemoryDuration();