From 1e684c1d32622c4893738cbc9d218c3e5876e16e Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 14 Dec 2021 23:49:27 +0800 Subject: [PATCH] =?UTF-8?q?opt.=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/AbstractTask.cpp | 4 ++-- src/MeoAssistant/Assistance.cpp | 2 +- src/MeoAssistant/Controller.cpp | 4 ++-- src/MeoAssistant/Logger.hpp | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/MeoAssistant/AbstractTask.cpp b/src/MeoAssistant/AbstractTask.cpp index 51289c1d38..bfb4f42a0d 100644 --- a/src/MeoAssistant/AbstractTask.cpp +++ b/src/MeoAssistant/AbstractTask.cpp @@ -47,7 +47,7 @@ bool AbstractTask::sleep(unsigned millisecond) if (millisecond == 0) { return true; } - auto start = std::chrono::system_clock::now(); + auto start = std::chrono::steady_clock::now(); long long duration = 0; json::value callback_json; @@ -56,7 +56,7 @@ bool AbstractTask::sleep(unsigned millisecond) while (!need_exit() && duration < millisecond) { duration = std::chrono::duration_cast( - std::chrono::system_clock::now() - start) + std::chrono::steady_clock::now() - start) .count(); std::this_thread::yield(); } diff --git a/src/MeoAssistant/Assistance.cpp b/src/MeoAssistant/Assistance.cpp index 1b68dac998..a4a84dbd26 100644 --- a/src/MeoAssistant/Assistance.cpp +++ b/src/MeoAssistant/Assistance.cpp @@ -457,7 +457,7 @@ void Assistance::working_proc() std::unique_lock lock(m_mutex); if (!m_thread_idle && !m_tasks_queue.empty()) { - auto start_time = std::chrono::system_clock::now(); + auto start_time = std::chrono::steady_clock::now(); auto task_ptr = m_tasks_queue.front(); diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 3949d4925b..ed932639e5 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -194,7 +194,7 @@ void asst::Controller::pipe_working_proc() } //else if (!m_thread_idle) { // 队列中没有任务,又不是闲置的时候,就去截图 // cmd_queue_lock.unlock(); - // auto start_time = std::chrono::system_clock::now(); + // auto start_time = std::chrono::steady_clock::now(); // screencap(); // cmd_queue_lock.lock(); // if (!m_cmd_queue.empty()) { @@ -447,7 +447,7 @@ void asst::Controller::random_delay() const if (opt.control_delay_upper != 0) { LogTraceFunction; static std::default_random_engine rand_engine( - std::chrono::system_clock::now().time_since_epoch().count()); + std::chrono::steady_clock::now().time_since_epoch().count()); static std::uniform_int_distribution rand_uni( opt.control_delay_lower, opt.control_delay_upper); diff --git a/src/MeoAssistant/Logger.hpp b/src/MeoAssistant/Logger.hpp index 02de9ac146..eb6eee3a35 100644 --- a/src/MeoAssistant/Logger.hpp +++ b/src/MeoAssistant/Logger.hpp @@ -146,20 +146,20 @@ namespace asst public: LoggerAux(const std::string& func_name) : m_func_name(func_name), - m_start_time(std::chrono::system_clock::now()) + m_start_time(std::chrono::steady_clock::now()) { Logger::get_instance().trace(m_func_name, " | enter"); } ~LoggerAux() { - auto duration = std::chrono::system_clock::now() - m_start_time; + auto duration = std::chrono::steady_clock::now() - m_start_time; Logger::get_instance().trace(m_func_name, " | leave,", std::chrono::duration_cast(duration).count(), "ms"); } private: std::string m_func_name; - std::chrono::time_point m_start_time; + std::chrono::time_point m_start_time; }; //static auto& log = Logger::get_instance();