From be8d8ded3febe473361f81786932e78cd84b4a82 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sun, 29 Jan 2017 03:12:00 +0300 Subject: [PATCH] replace high_resolution_clock --- Utilities/Timer.h | 12 ++++++------ rpcs3/Gui/ConLogFrame.cpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Utilities/Timer.h b/Utilities/Timer.h index 39ccfc0104..3908b8643c 100644 --- a/Utilities/Timer.h +++ b/Utilities/Timer.h @@ -6,8 +6,8 @@ class Timer { private: bool m_stopped; - std::chrono::high_resolution_clock::time_point m_start; - std::chrono::high_resolution_clock::time_point m_end; + std::chrono::steady_clock::time_point m_start; + std::chrono::steady_clock::time_point m_end; public: Timer() : m_stopped(false) @@ -17,13 +17,13 @@ public: void Start() { m_stopped = false; - m_start = std::chrono::high_resolution_clock::now(); + m_start = std::chrono::steady_clock::now(); } void Stop() { m_stopped = true; - m_end = std::chrono::high_resolution_clock::now(); + m_end = std::chrono::steady_clock::now(); } double GetElapsedTimeInSec() const @@ -38,14 +38,14 @@ public: u64 GetElapsedTimeInMicroSec() const { - std::chrono::high_resolution_clock::time_point now = m_stopped ? m_end : std::chrono::high_resolution_clock::now(); + std::chrono::steady_clock::time_point now = m_stopped ? m_end : std::chrono::steady_clock::now(); return std::chrono::duration_cast(now - m_start).count(); } u64 GetElapsedTimeInNanoSec() const { - std::chrono::high_resolution_clock::time_point now = m_stopped ? m_end : std::chrono::high_resolution_clock::now(); + std::chrono::steady_clock::time_point now = m_stopped ? m_end : std::chrono::steady_clock::now(); return std::chrono::duration_cast(now - m_start).count(); } diff --git a/rpcs3/Gui/ConLogFrame.cpp b/rpcs3/Gui/ConLogFrame.cpp index df10da9ec4..843999fb41 100644 --- a/rpcs3/Gui/ConLogFrame.cpp +++ b/rpcs3/Gui/ConLogFrame.cpp @@ -264,7 +264,7 @@ void LogFrame::OnTimer(wxTimerEvent& event) return wxString::FromUTF8(buf.data(), size); }; - const auto start = std::chrono::high_resolution_clock::now(); + const auto start = steady_clock::now(); // Check TTY logs while (const u64 size = std::min(sizeof(buf), m_tty_file.size() - m_tty_file.pos())) @@ -274,7 +274,7 @@ void LogFrame::OnTimer(wxTimerEvent& event) if (get_cfg_tty()) m_tty->AppendText(text); // Limit processing time - if (std::chrono::high_resolution_clock::now() >= start + 4ms || text.empty()) break; + if (steady_clock::now() >= start + 4ms || text.empty()) break; } // Check main logs @@ -309,6 +309,6 @@ void LogFrame::OnTimer(wxTimerEvent& event) s_gui_listener.pop(); // Limit processing time - if (std::chrono::high_resolution_clock::now() >= start + 7ms) break; + if (steady_clock::now() >= start + 7ms) break; } }