From d2ebcc714a4bad1ef6827302cd696f89ad1f50f6 Mon Sep 17 00:00:00 2001 From: RZH-150 Date: Sat, 6 Sep 2025 11:35:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=B4=E4=BE=A7=E6=8A=93=E6=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: RZH-150 --- service/BUILD.gn | 2 +- service/delegate_task/src/delegate_tasks.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/service/BUILD.gn b/service/BUILD.gn index 78dec99093..c9308d46a4 100644 --- a/service/BUILD.gn +++ b/service/BUILD.gn @@ -394,7 +394,7 @@ ohos_shared_library("libmmi-server") { sources += [ "window_manager/src/touch_drawing_manager.cpp" ] } -if (input_feature_key_hook) { + if (input_feature_key_hook) { sources += [ "event_hook/src/key_event_hook_manager.cpp", "event_hook/src/event_loop_closure_checker.cpp", diff --git a/service/delegate_task/src/delegate_tasks.cpp b/service/delegate_task/src/delegate_tasks.cpp index 9624263510..65eeedc0ef 100644 --- a/service/delegate_task/src/delegate_tasks.cpp +++ b/service/delegate_task/src/delegate_tasks.cpp @@ -18,6 +18,7 @@ #include #include +#include "backtrace_local.h" #include "error_multimodal.h" #undef MMI_LOG_DOMAIN @@ -29,6 +30,7 @@ namespace OHOS { namespace MMI { namespace { constexpr int32_t TIMED_WAIT_MS = 2; + constexpr size_t SKIP_FRAME_NUM = 0; } // namespace void DelegateTasks::Task::ProcessTask() { @@ -115,7 +117,11 @@ int32_t DelegateTasks::PostSyncTask(DTaskCallback callback) auto res = future.wait_for(span); task->SetWaited(); if (res == std::future_status::timeout) { - MMI_HILOGE("Task timeout"); + int32_t workerThreadId = static_cast(workerThreadId_); + std::string stackTrace; + HiviewDFX::GetBacktraceStringByTid(stackTrace, workerThreadId, SKIP_FRAME_NUM, false); + MMI_HILOGE("Task timeout, taskId:%{public}" PRId64 ", num of tasks:%{public}zu, stack of workerThread:%{public}s", + id_, tasks_.size(), stackTrace.c_str()); return ETASKS_WAIT_TIMEOUT; } else if (res == std::future_status::deferred) { MMI_HILOGE("Task deferred"); -- Gitee From 4709125662e910b4016d34c6a91b8609bbb06205 Mon Sep 17 00:00:00 2001 From: RZH-150 Date: Sat, 6 Sep 2025 12:01:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=8C=E5=AE=BD=E8=BF=87=E9=AB=98?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: RZH-150 --- service/delegate_task/src/delegate_tasks.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/delegate_task/src/delegate_tasks.cpp b/service/delegate_task/src/delegate_tasks.cpp index 65eeedc0ef..a06120bcd3 100644 --- a/service/delegate_task/src/delegate_tasks.cpp +++ b/service/delegate_task/src/delegate_tasks.cpp @@ -120,8 +120,8 @@ int32_t DelegateTasks::PostSyncTask(DTaskCallback callback) int32_t workerThreadId = static_cast(workerThreadId_); std::string stackTrace; HiviewDFX::GetBacktraceStringByTid(stackTrace, workerThreadId, SKIP_FRAME_NUM, false); - MMI_HILOGE("Task timeout, taskId:%{public}" PRId64 ", num of tasks:%{public}zu, stack of workerThread:%{public}s", - id_, tasks_.size(), stackTrace.c_str()); + MMI_HILOGE("Task timeout, taskId:%{public}" PRId64 ", num of tasks:%{public}zu, + stack of workerThread:%{public}s", id_, tasks_.size(), stackTrace.c_str()); return ETASKS_WAIT_TIMEOUT; } else if (res == std::future_status::deferred) { MMI_HILOGE("Task deferred"); -- Gitee