From bc46089ab0ca7963ca3b5507969a3df0f2afca6c Mon Sep 17 00:00:00 2001
From: Sam Belliveau <sam.belliveau@gmail.com>
Date: Fri, 30 Dec 2022 14:56:08 -0500
Subject: PerformanceTracker: Use shared_mutex instead of mutex so multiple
 threads can read at the same time.

---
 Source/Core/VideoCommon/PerformanceTracker.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'Source/Core/VideoCommon/PerformanceTracker.cpp')

diff --git a/Source/Core/VideoCommon/PerformanceTracker.cpp b/Source/Core/VideoCommon/PerformanceTracker.cpp
index ffde157883..305fb35598 100644
--- a/Source/Core/VideoCommon/PerformanceTracker.cpp
+++ b/Source/Core/VideoCommon/PerformanceTracker.cpp
@@ -5,8 +5,10 @@
 
 #include <algorithm>
 #include <cmath>
-#include <implot.h>
 #include <iomanip>
+#include <mutex>
+
+#include <implot.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
@@ -36,7 +38,7 @@ PerformanceTracker::~PerformanceTracker()
 
 void PerformanceTracker::Reset()
 {
-  std::lock_guard lock{m_mutex};
+  std::unique_lock lock{m_mutex};
 
   QueueClear();
   m_last_time = Clock::now();
@@ -47,7 +49,7 @@ void PerformanceTracker::Reset()
 
 void PerformanceTracker::Count()
 {
-  std::lock_guard lock{m_mutex};
+  std::unique_lock lock{m_mutex};
 
   if (m_paused)
     return;
@@ -97,19 +99,19 @@ DT PerformanceTracker::GetSampleWindow() const
 
 double PerformanceTracker::GetHzAvg() const
 {
-  std::lock_guard lock{m_mutex};
+  std::shared_lock lock{m_mutex};
   return m_hz_avg;
 }
 
 DT PerformanceTracker::GetDtAvg() const
 {
-  std::lock_guard lock{m_mutex};
+  std::shared_lock lock{m_mutex};
   return m_dt_avg;
 }
 
 DT PerformanceTracker::GetDtStd() const
 {
-  std::lock_guard lock{m_mutex};
+  std::unique_lock lock{m_mutex};
 
   if (m_dt_std)
     return *m_dt_std;
@@ -130,7 +132,7 @@ DT PerformanceTracker::GetDtStd() const
 
 DT PerformanceTracker::GetLastRawDt() const
 {
-  std::lock_guard lock{m_mutex};
+  std::shared_lock lock{m_mutex};
 
   if (QueueEmpty())
     return DT::zero();
@@ -142,7 +144,7 @@ void PerformanceTracker::ImPlotPlotLines(const char* label) const
 {
   static std::array<float, MAX_DT_QUEUE_SIZE + 2> x, y;
 
-  std::lock_guard lock{m_mutex};
+  std::shared_lock lock{m_mutex};
 
   if (QueueEmpty())
     return;
@@ -238,7 +240,7 @@ void PerformanceTracker::LogRenderTimeToFile(DT val)
 
 void PerformanceTracker::SetPaused(bool paused)
 {
-  std::lock_guard lock{m_mutex};
+  std::unique_lock lock{m_mutex};
 
   m_paused = paused;
   if (m_paused)
-- 
cgit v1.2.3


From 588a72a4fc7eb46f161687d0828afd9703e618ee Mon Sep 17 00:00:00 2001
From: Sam Belliveau <sam.belliveau@gmail.com>
Date: Fri, 30 Dec 2022 14:56:08 -0500
Subject: PerformanceTracker: Add ownership of m_log_name.

---
 Source/Core/VideoCommon/PerformanceTracker.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Source/Core/VideoCommon/PerformanceTracker.cpp')

diff --git a/Source/Core/VideoCommon/PerformanceTracker.cpp b/Source/Core/VideoCommon/PerformanceTracker.cpp
index 305fb35598..93b33cff9a 100644
--- a/Source/Core/VideoCommon/PerformanceTracker.cpp
+++ b/Source/Core/VideoCommon/PerformanceTracker.cpp
@@ -18,7 +18,7 @@
 
 static constexpr double SAMPLE_RC_RATIO = 0.25;
 
-PerformanceTracker::PerformanceTracker(const char* log_name,
+PerformanceTracker::PerformanceTracker(const std::optional<std::string> log_name,
                                        const std::optional<s64> sample_window_us)
     : m_on_state_changed_handle{Core::AddOnStateChangedCallback([this](Core::State state) {
         if (state == Core::State::Paused)
@@ -86,8 +86,7 @@ void PerformanceTracker::Count()
 
   m_dt_std = std::nullopt;
 
-  if (m_log_name && g_ActiveConfig.bLogRenderTimeToFile)
-    LogRenderTimeToFile(diff);
+  LogRenderTimeToFile(diff);
 }
 
 DT PerformanceTracker::GetSampleWindow() const
@@ -230,9 +229,13 @@ bool PerformanceTracker::QueueEmpty() const
 
 void PerformanceTracker::LogRenderTimeToFile(DT val)
 {
+  if (!m_log_name || !g_ActiveConfig.bLogRenderTimeToFile)
+    return;
+
   if (!m_bench_file.is_open())
   {
-    File::OpenFStream(m_bench_file, File::GetUserPath(D_LOGS_IDX) + m_log_name, std::ios_base::out);
+    File::OpenFStream(m_bench_file, File::GetUserPath(D_LOGS_IDX) + *m_log_name,
+                      std::ios_base::out);
   }
 
   m_bench_file << std::fixed << std::setprecision(8) << DT_ms(val).count() << std::endl;
-- 
cgit v1.2.3