From 17d367c8e858967eb45fc936b77112e0e2cfe54c Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 5 Jun 2023 13:16:18 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"chore:=20=E5=8A=A0=E5=85=A5=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=97=A5=E5=BF=97=E6=8E=92=E6=9F=A5=E6=AD=BB=E9=94=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 983a6cfb82bdd58ddc47f9f62bb9262a0a8466e8. --- src/MaaCore/Assistant.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/MaaCore/Assistant.cpp b/src/MaaCore/Assistant.cpp index 4c86e36fc2..3c97c653ac 100644 --- a/src/MaaCore/Assistant.cpp +++ b/src/MaaCore/Assistant.cpp @@ -56,17 +56,14 @@ Assistant::~Assistant() m_thread_idle = true; { - LogTraceScope("m_call_mutex"); std::unique_lock lock(m_call_mutex); m_call_condvar.notify_all(); } { - LogTraceScope("m_mutex"); std::unique_lock lock(m_mutex); m_condvar.notify_all(); } { - LogTraceScope("m_msg_mutex"); std::unique_lock lock(m_msg_mutex); m_msg_condvar.notify_all(); } @@ -374,7 +371,6 @@ void Assistant::working_proc() std::vector finished_tasks; while (true) { - LogTraceScope("working_proc loop"); std::unique_lock lock(m_mutex); if (m_thread_exit) { return; @@ -384,7 +380,6 @@ void Assistant::working_proc() finished_tasks.clear(); m_thread_idle = true; Log.flush(); - LogTraceScope("wait for m_condvar"); m_condvar.wait(lock); continue; } @@ -438,14 +433,12 @@ void Assistant::msg_proc() LogTraceFunction; while (true) { - // LogTraceScope("msg_proc loop"); std::unique_lock lock(m_msg_mutex); if (m_thread_exit) { return; } if (m_msg_queue.empty()) { - LogTraceScope("wait for m_msg_condvar"); m_msg_condvar.wait(lock); continue; } @@ -486,7 +479,6 @@ asst::Assistant::AsyncCallId asst::Assistant::append_async_call(AsyncCallItem::T bool asst::Assistant::wait_async_id(AsyncCallId id) { while (true) { - LogTraceScope("wait_async_id loop"); std::unique_lock lock(m_completed_call_mutex); if (m_thread_exit) { return false; @@ -506,14 +498,12 @@ void asst::Assistant::call_proc() LogTraceFunction; while (true) { - LogTraceScope("call_proc loop"); std::unique_lock lock(m_call_mutex); if (m_thread_exit) { return; } if (m_call_queue.empty()) { - LogTraceScope("wait for m_call_condvar"); m_call_condvar.wait(lock); continue; }