From 76a5792a127eabde4d7d8dbdf4f063a2188097e5 Mon Sep 17 00:00:00 2001 From: cs1111 Date: Sat, 30 Aug 2025 14:23:23 +0800 Subject: [PATCH] fix:remove handler alarm signal Signed-off-by: cs1111 Change-Id: I2120885435bd96339c00e3a55edb5b1afec4e830 --- frameworks/localhandler/dfx_signal_local_handler.cpp | 2 +- interfaces/innerkits/dump_catcher/dfx_dump_catcher.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frameworks/localhandler/dfx_signal_local_handler.cpp b/frameworks/localhandler/dfx_signal_local_handler.cpp index 36c3f4bdc..cff33f089 100644 --- a/frameworks/localhandler/dfx_signal_local_handler.cpp +++ b/frameworks/localhandler/dfx_signal_local_handler.cpp @@ -55,7 +55,7 @@ static struct ProcessDumpRequest g_request; static pthread_mutex_t g_signalHandlerMutex = PTHREAD_MUTEX_INITIALIZER; static constexpr int CATCHER_STACK_SIGNALS[] = { - SIGABRT, SIGBUS, SIGILL, SIGSEGV, SIGALRM, + SIGABRT, SIGBUS, SIGILL, SIGSEGV, }; #if !defined(__aarch64__) && !defined(__loongarch_lp64) diff --git a/interfaces/innerkits/dump_catcher/dfx_dump_catcher.cpp b/interfaces/innerkits/dump_catcher/dfx_dump_catcher.cpp index ceaa3e70e..c3ccb077a 100644 --- a/interfaces/innerkits/dump_catcher/dfx_dump_catcher.cpp +++ b/interfaces/innerkits/dump_catcher/dfx_dump_catcher.cpp @@ -662,6 +662,10 @@ int32_t DfxDumpCatcher::Impl::DoDumpCatchRemote(int pid, int tid, std::string& m return DUMPCATCH_EPARAM; } + if (IsFrozen(pid, ret) && ret == DUMPCATCH_TIMEOUT_KERNEL_FROZEN) { + stack_ = stackKit_.GetProcessStackWithTimeout(pid, WAIT_GET_KERNEL_STACK_TIMEOUT); + return ret; + } if (DfxDumpCatcherSlowPolicy::GetInstance().IsDumpCatcherInSlowPeriod(pid)) { DFXLOGW("dumpcatch in slow period, return pid (%{public}d) kernel stack directly!", pid); msg.append("Result: pid(" + std::to_string(pid) + ") last dump slow, return kernel stack directly.\n"); -- Gitee