From 6def4ead01bfcf3b5b12bbb7e16f21217d6088bf Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Wed, 9 Jul 2014 22:30:34 +0200 Subject: FPSCounter: Flush the logs every second and close them when the renderer is shut down. --- Source/Core/VideoCommon/FPSCounter.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Source/Core/VideoCommon/FPSCounter.cpp') diff --git a/Source/Core/VideoCommon/FPSCounter.cpp b/Source/Core/VideoCommon/FPSCounter.cpp index 10bfebb26f..c9615a2f68 100644 --- a/Source/Core/VideoCommon/FPSCounter.cpp +++ b/Source/Core/VideoCommon/FPSCounter.cpp @@ -34,6 +34,12 @@ void Initialize() s_bench_file.close(); } +void Shutdown() +{ + if (s_bench_file.is_open()) + s_bench_file.close(); +} + static void LogRenderTimeToFile(u64 val) { if (!s_bench_file.is_open()) @@ -49,6 +55,7 @@ int Update() s_update_time.Update(); s_fps = s_counter - s_fps_last_counter; s_fps_last_counter = s_counter; + s_bench_file.flush(); } if (g_ActiveConfig.bLogRenderTimeToFile) -- cgit v1.2.3 From 3b978f7c27fe2552e5bfb0e97ef9c82580d8a9d9 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Sun, 13 Jul 2014 13:04:25 +0200 Subject: Turn the FPSCounter namespace into a class. --- Source/Core/VideoCommon/FPSCounter.cpp | 57 ++++++++++++---------------------- 1 file changed, 20 insertions(+), 37 deletions(-) (limited to 'Source/Core/VideoCommon/FPSCounter.cpp') diff --git a/Source/Core/VideoCommon/FPSCounter.cpp b/Source/Core/VideoCommon/FPSCounter.cpp index c9615a2f68..7a912c2fd7 100644 --- a/Source/Core/VideoCommon/FPSCounter.cpp +++ b/Source/Core/VideoCommon/FPSCounter.cpp @@ -10,61 +10,44 @@ #include "VideoCommon/FPSCounter.h" #include "VideoCommon/VideoConfig.h" -namespace FPSCounter -{ #define FPS_REFRESH_INTERVAL 1000 -static unsigned int s_counter = 0; -static unsigned int s_fps = 0; -static unsigned int s_fps_last_counter = 0; -static Common::Timer s_update_time; - -static Common::Timer s_render_time; -static std::ofstream s_bench_file; - -void Initialize() +FPSCounter::FPSCounter() { - s_counter = s_fps_last_counter = 0; - s_fps = 0; - - s_update_time.Update(); - s_render_time.Update(); - - if (s_bench_file.is_open()) - s_bench_file.close(); + m_update_time.Update(); + m_render_time.Update(); } -void Shutdown() +FPSCounter::~FPSCounter() { - if (s_bench_file.is_open()) - s_bench_file.close(); + if (m_bench_file.is_open()) + m_bench_file.close(); } -static void LogRenderTimeToFile(u64 val) +void FPSCounter::LogRenderTimeToFile(u64 val) { - if (!s_bench_file.is_open()) - s_bench_file.open(File::GetUserPath(D_LOGS_IDX) + "render_time.txt"); + if (!m_bench_file.is_open()) + m_bench_file.open(File::GetUserPath(D_LOGS_IDX) + "render_time.txt"); - s_bench_file << val << std::endl; + m_bench_file << val << std::endl; } -int Update() +int FPSCounter::Update() { - if (s_update_time.GetTimeDifference() >= FPS_REFRESH_INTERVAL) + if (m_update_time.GetTimeDifference() >= FPS_REFRESH_INTERVAL) { - s_update_time.Update(); - s_fps = s_counter - s_fps_last_counter; - s_fps_last_counter = s_counter; - s_bench_file.flush(); + m_update_time.Update(); + m_fps = m_counter - m_fps_last_counter; + m_fps_last_counter = m_counter; + m_bench_file.flush(); } if (g_ActiveConfig.bLogRenderTimeToFile) { - LogRenderTimeToFile(s_render_time.GetTimeDifference()); - s_render_time.Update(); + LogRenderTimeToFile(m_render_time.GetTimeDifference()); + m_render_time.Update(); } - s_counter++; - return s_fps; + m_counter++; + return m_fps; } -} \ No newline at end of file -- cgit v1.2.3 From eaa7460636f01f7779154259d492568c9d2dee1e Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Fri, 18 Jul 2014 12:49:40 +0200 Subject: FPSCounter: Remove redundant destructor. --- Source/Core/VideoCommon/FPSCounter.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'Source/Core/VideoCommon/FPSCounter.cpp') diff --git a/Source/Core/VideoCommon/FPSCounter.cpp b/Source/Core/VideoCommon/FPSCounter.cpp index 7a912c2fd7..1ce46377c7 100644 --- a/Source/Core/VideoCommon/FPSCounter.cpp +++ b/Source/Core/VideoCommon/FPSCounter.cpp @@ -18,12 +18,6 @@ FPSCounter::FPSCounter() m_render_time.Update(); } -FPSCounter::~FPSCounter() -{ - if (m_bench_file.is_open()) - m_bench_file.close(); -} - void FPSCounter::LogRenderTimeToFile(u64 val) { if (!m_bench_file.is_open()) -- cgit v1.2.3