midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port yuzu-emu/yuzu#4472: "perf_stats: Mark GetMeanFrametime() as const" (#5498)

Browse Source 
The general pattern is to mark mutexes as mutable when it comes to
matters of constness, given the mutex acts as a transient member of a
data structure.

Co-Authored-By: LC <lioncash@users.noreply.github.com>
This commit is contained in:
Tobias 2020-08-29 17:29:20 +02:00 committed by GitHub
parent a5fd11c213
commit 08e508e846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/perf_stats.cpp
View File

@ -73,15 +73,16 @@ void PerfStats::EndGameFrame() {
game_frames += 1; game_frames += 1;
} }
double PerfStats::GetMeanFrametime() { double PerfStats::GetMeanFrametime() const {
std::lock_guard lock{object_mutex}; std::lock_guard lock{object_mutex};
if (current_index <= IgnoreFrames) { if (current_index <= IgnoreFrames) {
return 0; return 0;
} }
const double sum = std::accumulate(perf_history.begin() + IgnoreFrames, const double sum = std::accumulate(perf_history.begin() + IgnoreFrames,
perf_history.begin() + current_index, 0); perf_history.begin() + current_index, 0.0);
return sum / (current_index - IgnoreFrames); return sum / static_cast<double>(current_index - IgnoreFrames);
} }
PerfStats::Results PerfStats::GetAndResetStats(microseconds current_system_time_us) { PerfStats::Results PerfStats::GetAndResetStats(microseconds current_system_time_us) {
@ -110,7 +111,7 @@ PerfStats::Results PerfStats::GetAndResetStats(microseconds current_system_time_
return results; return results;
} }
double PerfStats::GetLastFrameTimeScale() { double PerfStats::GetLastFrameTimeScale() const {
std::lock_guard lock{object_mutex}; std::lock_guard lock{object_mutex};
constexpr double FRAME_LENGTH = 1.0 / GPU::SCREEN_REFRESH_RATE; constexpr double FRAME_LENGTH = 1.0 / GPU::SCREEN_REFRESH_RATE;

11
src/core/perf_stats.h
View File

@ -21,7 +21,6 @@ namespace Core {
class PerfStats { class PerfStats {
public: public:
explicit PerfStats(u64 title_id); explicit PerfStats(u64 title_id);
~PerfStats(); ~PerfStats();
using Clock = std::chrono::high_resolution_clock; using Clock = std::chrono::high_resolution_clock;
@ -44,18 +43,18 @@ public:
Results GetAndResetStats(std::chrono::microseconds current_system_time_us); Results GetAndResetStats(std::chrono::microseconds current_system_time_us);
/** /**
* Returns the Arthimetic Mean of all frametime values stored in the performance history. * Returns the arithmetic mean of all frametime values stored in the performance history.
*/ */
double GetMeanFrametime(); double GetMeanFrametime() const;
/** /**
* Gets the ratio between walltime and the emulated time of the previous system frame. This is * Gets the ratio between walltime and the emulated time of the previous system frame. This is
* useful for scaling inputs or outputs moving between the two time domains. * useful for scaling inputs or outputs moving between the two time domains.
*/ */
double GetLastFrameTimeScale(); double GetLastFrameTimeScale() const;
private: private:
std::mutex object_mutex{}; mutable std::mutex object_mutex;
/// Title ID for the game that is running. 0 if there is no game running yet /// Title ID for the game that is running. 0 if there is no game running yet
u64 title_id{0}; u64 title_id{0};
@ -63,7 +62,7 @@ private:
std::size_t current_index{0}; std::size_t current_index{0};
/// Stores an hour of historical frametime data useful for processing and tracking performance /// Stores an hour of historical frametime data useful for processing and tracking performance
/// regressions with code changes. /// regressions with code changes.
std::array<double, 216000> perf_history = {}; std::array<double, 216000> perf_history{};
/// Point when the cumulative counters were reset /// Point when the cumulative counters were reset
Clock::time_point reset_point = Clock::now(); Clock::time_point reset_point = Clock::now();