summaryrefslogtreecommitdiff
path: root/src/core/perf_stats.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2020-08-04 07:00:23 -0700
committerGravatar GitHub2020-08-04 07:00:23 -0700
commitecbee11829c761163b4a2fa285b9ad49ec1035e0 (patch)
tree396445a362ff7431ea79bdbc9d8ce614b2c29b54 /src/core/perf_stats.cpp
parentMerge pull request #4469 from lioncash/missing (diff)
parentperf_stats: Make use of designated initializers (diff)
downloadyuzu-ecbee11829c761163b4a2fa285b9ad49ec1035e0.tar.gz
yuzu-ecbee11829c761163b4a2fa285b9ad49ec1035e0.tar.xz
yuzu-ecbee11829c761163b4a2fa285b9ad49ec1035e0.zip
Merge pull request #4472 from lioncash/const-get
perf_stats: Mark GetMeanFrametime() as const
Diffstat (limited to 'src/core/perf_stats.cpp')
-rw-r--r--src/core/perf_stats.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp
index 29339ead7..b899ac884 100644
--- a/src/core/perf_stats.cpp
+++ b/src/core/perf_stats.cpp
@@ -74,15 +74,16 @@ void PerfStats::EndGameFrame() {
74 game_frames += 1; 74 game_frames += 1;
75} 75}
76 76
77double PerfStats::GetMeanFrametime() { 77double PerfStats::GetMeanFrametime() const {
78 std::lock_guard lock{object_mutex}; 78 std::lock_guard lock{object_mutex};
79 79
80 if (current_index <= IgnoreFrames) { 80 if (current_index <= IgnoreFrames) {
81 return 0; 81 return 0;
82 } 82 }
83
83 const double sum = std::accumulate(perf_history.begin() + IgnoreFrames, 84 const double sum = std::accumulate(perf_history.begin() + IgnoreFrames,
84 perf_history.begin() + current_index, 0.0); 85 perf_history.begin() + current_index, 0.0);
85 return sum / (current_index - IgnoreFrames); 86 return sum / static_cast<double>(current_index - IgnoreFrames);
86} 87}
87 88
88PerfStatsResults PerfStats::GetAndResetStats(microseconds current_system_time_us) { 89PerfStatsResults PerfStats::GetAndResetStats(microseconds current_system_time_us) {
@@ -94,12 +95,13 @@ PerfStatsResults PerfStats::GetAndResetStats(microseconds current_system_time_us
94 95
95 const auto system_us_per_second = (current_system_time_us - reset_point_system_us) / interval; 96 const auto system_us_per_second = (current_system_time_us - reset_point_system_us) / interval;
96 97
97 PerfStatsResults results{}; 98 const PerfStatsResults results{
98 results.system_fps = static_cast<double>(system_frames) / interval; 99 .system_fps = static_cast<double>(system_frames) / interval,
99 results.game_fps = static_cast<double>(game_frames) / interval; 100 .game_fps = static_cast<double>(game_frames) / interval,
100 results.frametime = duration_cast<DoubleSecs>(accumulated_frametime).count() / 101 .frametime = duration_cast<DoubleSecs>(accumulated_frametime).count() /
101 static_cast<double>(system_frames); 102 static_cast<double>(system_frames),
102 results.emulation_speed = system_us_per_second.count() / 1'000'000.0; 103 .emulation_speed = system_us_per_second.count() / 1'000'000.0,
104 };
103 105
104 // Reset counters 106 // Reset counters
105 reset_point = now; 107 reset_point = now;
@@ -111,7 +113,7 @@ PerfStatsResults PerfStats::GetAndResetStats(microseconds current_system_time_us
111 return results; 113 return results;
112} 114}
113 115
114double PerfStats::GetLastFrameTimeScale() { 116double PerfStats::GetLastFrameTimeScale() const {
115 std::lock_guard lock{object_mutex}; 117 std::lock_guard lock{object_mutex};
116 118
117 constexpr double FRAME_LENGTH = 1.0 / 60; 119 constexpr double FRAME_LENGTH = 1.0 / 60;