From c93dd0fe2c1fa22f299cd7a1a2aba63c0af4f957 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 27 Aug 2022 23:50:28 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=86=8D=E6=95=B4=E7=90=86=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/Controller.cpp | 13 ++++++++----- src/MeoAssistant/OcrPack.cpp | 2 -- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 741325f69d..0149815bf8 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -317,8 +317,6 @@ std::optional> asst::Controller::call_command(const std::stri m_child = fork(); if (m_child == 0) { // child process - LogTraceScope("Child process: " + cmd); - std::cout << ("Child process: " + cmd) << std::endl; dup2(m_pipe_in[PIPE_READ], STDIN_FILENO); dup2(m_pipe_out[PIPE_WRITE], STDOUT_FILENO); @@ -335,7 +333,6 @@ std::optional> asst::Controller::call_command(const std::stri } else if (m_child > 0) { // parent process - // LogTraceScope("Parent process: " + cmd); std::unique_lock pipe_lock(m_pipe_mutex); do { ssize_t read_num = read(m_pipe_out[PIPE_READ], m_pipe_buffer.get(), PipeBuffSize); @@ -348,13 +345,19 @@ std::optional> asst::Controller::call_command(const std::stri } else { // failed to create child process + Log.error("Call `", cmd, "` create process failed, child:", m_child); return std::nullopt; } #endif - Log.trace("Call `", cmd, "` ret", exit_ret, ", output size:", pipe_data.size()); + auto duration = + std::chrono::duration_cast(std::chrono::steady_clock::now() - start_time).count(); if (!pipe_data.empty() && pipe_data.size() < 4096) { - Log.trace("output:", std::string(pipe_data.cbegin(), pipe_data.cend())); + Log.trace("Call `", cmd, "` ret", exit_ret, ", output:", std::string(pipe_data.cbegin(), pipe_data.cend()), + ", cost", duration, "ms"); + } + else { + Log.trace("Call `", cmd, "` ret", exit_ret, ", output size:", pipe_data.size(), ", cost", duration, "ms"); } if (!exit_ret) { diff --git a/src/MeoAssistant/OcrPack.cpp b/src/MeoAssistant/OcrPack.cpp index d152f1ba87..748649fd3f 100644 --- a/src/MeoAssistant/OcrPack.cpp +++ b/src/MeoAssistant/OcrPack.cpp @@ -56,8 +56,6 @@ bool asst::OcrPack::load(const std::string& dir) std::vector asst::OcrPack::recognize(const cv::Mat& image, const asst::TextRectProc& pred, bool without_det) { - LogTraceFunction; - size_t size = 0; std::vector buf;