Merge tag '2024-07-12' into push-2024-07-12

Change-Id: Id410f0f5e2fd814a0a9e321417d66fa7da88aae1
intel · Jul 14, 2024 · 15f9147 · 15f9147
2 parents dbe28ec + fdc9cfe
commit 15f9147
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/cpucounters.cpp b/src/cpucounters.cpp
@@ -3062,6 +3062,7 @@ PCM::PCM() :
 #ifdef PCM_USE_PERF
     canUsePerf = true;
     perfEventHandle.resize(num_cores, std::vector<int>(PERF_MAX_COUNTERS, -1));
+    std::fill(perfTopDownPos.begin(), perfTopDownPos.end(), 0);
 #endif
 
     for (int32 i = 0; i < num_cores; ++i)

diff --git a/src/pcm-accel-common.cpp b/src/pcm-accel-common.cpp
@@ -351,13 +351,16 @@ void readAccelCounters(SystemCounterState& sycs_)
 }
 
 AcceleratorCounterState* AcceleratorCounterState::instance = NULL;
+
+std::mutex instanceCreationMutexForAcceleratorCounterState{};
+
 AcceleratorCounterState * AcceleratorCounterState::getInstance()
  {
     // lock-free read
     // cppcheck-suppress identicalConditionAfterEarlyExit
     if (instance) return instance;
 
-    std::unique_lock<std::mutex> instanceCreationMutex;
+    std::unique_lock<std::mutex> _(instanceCreationMutexForAcceleratorCounterState);
     // cppcheck-suppress identicalConditionAfterEarlyExit
     if (instance) return instance;