diff options
| author | 2022-04-08 14:01:42 -0700 | |
|---|---|---|
| committer | 2022-04-08 14:01:42 -0700 | |
| commit | 04efd729d6b86b133d1ccacfcab77235e247f766 (patch) | |
| tree | 2a896020311d81e739adf0d2803d589f88ece313 /src/core/perf_stats.cpp | |
| parent | Merge pull request #8173 from Morph1984/msvc-warn-unused-fn (diff) | |
| parent | core/hle: Standardize scoped_lock initializers (diff) | |
| download | yuzu-04efd729d6b86b133d1ccacfcab77235e247f766.tar.gz yuzu-04efd729d6b86b133d1ccacfcab77235e247f766.tar.xz yuzu-04efd729d6b86b133d1ccacfcab77235e247f766.zip | |
Merge pull request #8169 from merryhime/scoped_lock
Replace lock_guard with scoped_lock
Diffstat (limited to 'src/core/perf_stats.cpp')
| -rw-r--r-- | src/core/perf_stats.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp index 52c43c857..6ef459b7a 100644 --- a/src/core/perf_stats.cpp +++ b/src/core/perf_stats.cpp | |||
| @@ -53,13 +53,13 @@ PerfStats::~PerfStats() { | |||
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | void PerfStats::BeginSystemFrame() { | 55 | void PerfStats::BeginSystemFrame() { |
| 56 | std::lock_guard lock{object_mutex}; | 56 | std::scoped_lock lock{object_mutex}; |
| 57 | 57 | ||
| 58 | frame_begin = Clock::now(); | 58 | frame_begin = Clock::now(); |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | void PerfStats::EndSystemFrame() { | 61 | void PerfStats::EndSystemFrame() { |
| 62 | std::lock_guard lock{object_mutex}; | 62 | std::scoped_lock lock{object_mutex}; |
| 63 | 63 | ||
| 64 | auto frame_end = Clock::now(); | 64 | auto frame_end = Clock::now(); |
| 65 | const auto frame_time = frame_end - frame_begin; | 65 | const auto frame_time = frame_end - frame_begin; |
| @@ -79,7 +79,7 @@ void PerfStats::EndGameFrame() { | |||
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | double PerfStats::GetMeanFrametime() const { | 81 | double PerfStats::GetMeanFrametime() const { |
| 82 | std::lock_guard lock{object_mutex}; | 82 | std::scoped_lock lock{object_mutex}; |
| 83 | 83 | ||
| 84 | if (current_index <= IgnoreFrames) { | 84 | if (current_index <= IgnoreFrames) { |
| 85 | return 0; | 85 | return 0; |
| @@ -91,7 +91,7 @@ double PerfStats::GetMeanFrametime() const { | |||
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | PerfStatsResults PerfStats::GetAndResetStats(microseconds current_system_time_us) { | 93 | PerfStatsResults PerfStats::GetAndResetStats(microseconds current_system_time_us) { |
| 94 | std::lock_guard lock{object_mutex}; | 94 | std::scoped_lock lock{object_mutex}; |
| 95 | 95 | ||
| 96 | const auto now = Clock::now(); | 96 | const auto now = Clock::now(); |
| 97 | // Walltime elapsed since stats were reset | 97 | // Walltime elapsed since stats were reset |
| @@ -120,7 +120,7 @@ PerfStatsResults PerfStats::GetAndResetStats(microseconds current_system_time_us | |||
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | double PerfStats::GetLastFrameTimeScale() const { | 122 | double PerfStats::GetLastFrameTimeScale() const { |
| 123 | std::lock_guard lock{object_mutex}; | 123 | std::scoped_lock lock{object_mutex}; |
| 124 | 124 | ||
| 125 | constexpr double FRAME_LENGTH = 1.0 / 60; | 125 | constexpr double FRAME_LENGTH = 1.0 / 60; |
| 126 | return duration_cast<DoubleSecs>(previous_frame_length).count() / FRAME_LENGTH; | 126 | return duration_cast<DoubleSecs>(previous_frame_length).count() / FRAME_LENGTH; |