From e579bfea7e61267d5b7e3181a20ae65f97b0b8da Mon Sep 17 00:00:00 2001 From: peterhuangyu Date: Mon, 5 Feb 2024 14:44:36 +0800 Subject: [PATCH] add hisysevent write result Signed-off-by: peterhuangyu --- frameworks/native/watchdog_inner.cpp | 7 ++++--- frameworks/native/watchdog_task.cpp | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/frameworks/native/watchdog_inner.cpp b/frameworks/native/watchdog_inner.cpp index a690d41..8d4c4f7 100644 --- a/frameworks/native/watchdog_inner.cpp +++ b/frameworks/native/watchdog_inner.cpp @@ -460,14 +460,15 @@ void WatchdogInner::SendFfrtEvent(const std::string &msg, const std::string &eve char buff[BUFF_STACK_SIZE] = {0}; ffrt_watchdog_dumpinfo(buff, BUFF_STACK_SIZE); sendMsg += buff; - HiSysEventWrite(HiSysEvent::Domain::FRAMEWORK, eventName, HiSysEvent::EventType::FAULT, + int ret = HiSysEventWrite(HiSysEvent::Domain::FRAMEWORK, eventName, HiSysEvent::EventType::FAULT, "PID", pid, "TGID", gid, "UID", uid, "MODULE_NAME", taskInfo, "PROCESS_NAME", GetSelfProcName(), "MSG", sendMsg); - XCOLLIE_LOGI("send event [FRAMEWORK,%{public}s], msg=%{public}s", eventName.c_str(), msg.c_str()); + XCOLLIE_LOGI("hisysevent write result=%{public}d, send event [FRAMEWORK,%{public}s], " + "msg=%{public}s", ret, eventName.c_str(), msg.c_str()); } void WatchdogInner::LeftTimeExitProcess(const std::string &description) @@ -477,7 +478,7 @@ void WatchdogInner::LeftTimeExitProcess(const std::string &description) XCOLLIE_LOGI("heap dump for %{public}d, don't exit.", pid); return; } - DelayBeforeExit(3); // sleep 3s for hiview dump + DelayBeforeExit(10); // sleep 10s for hiview dump XCOLLIE_LOGI("Process is going to exit, reason:%{public}s.", description.c_str()); WatchdogInner::WriteStringToFile(pid, "0"); diff --git a/frameworks/native/watchdog_task.cpp b/frameworks/native/watchdog_task.cpp index 048063a..4971e92 100644 --- a/frameworks/native/watchdog_task.cpp +++ b/frameworks/native/watchdog_task.cpp @@ -155,7 +155,7 @@ void WatchdogTask::SendEvent(const std::string &msg, const std::string &eventNam std::string sendMsg = std::string((ctime(&curTime) == nullptr) ? "" : ctime(&curTime)) + "\n" + msg + "\n"; sendMsg += checker->GetDumpInfo(); - HiSysEventWrite(HiSysEvent::Domain::FRAMEWORK, eventName, HiSysEvent::EventType::FAULT, + int ret = HiSysEventWrite(HiSysEvent::Domain::FRAMEWORK, eventName, HiSysEvent::EventType::FAULT, "PID", pid, "TGID", gid, "UID", uid, @@ -163,7 +163,8 @@ void WatchdogTask::SendEvent(const std::string &msg, const std::string &eventNam "PROCESS_NAME", GetSelfProcName(), "MSG", sendMsg, "STACK", GetProcessStacktrace()); - XCOLLIE_LOGI("send event [FRAMEWORK,%{public}s], msg=%{public}s", eventName.c_str(), msg.c_str()); + XCOLLIE_LOGI("hisysevent write result=%{public}d, send event [FRAMEWORK,%{public}s], msg=%{public}s", + ret, eventName.c_str(), msg.c_str()); } void WatchdogTask::SendXCollieEvent(const std::string &timerName, const std::string &keyMsg) const @@ -195,7 +196,8 @@ void WatchdogTask::SendXCollieEvent(const std::string &timerName, const std::str XCOLLIE_LOGI("XCollieDumpKernel buff is %{public}s", val.hstackLogBuff); } - HiSysEventWrite(HiSysEvent::Domain::FRAMEWORK, "SERVICE_TIMEOUT", HiSysEvent::EventType::FAULT, + int result = HiSysEventWrite(HiSysEvent::Domain::FRAMEWORK, "SERVICE_TIMEOUT", + HiSysEvent::EventType::FAULT, "PID", pid, "TGID", gid, "UID", uid, @@ -203,7 +205,8 @@ void WatchdogTask::SendXCollieEvent(const std::string &timerName, const std::str "PROCESS_NAME", GetSelfProcName(), "MSG", sendMsg, "STACK", GetProcessStacktrace()+ "\n"+ (ret != 0 ? "" : val.hstackLogBuff)); - XCOLLIE_LOGI("send event [FRAMEWORK,SERVICE_TIMEOUT], msg=%{public}s", keyMsg.c_str()); + XCOLLIE_LOGI("hisysevent write result=%{public}d, send event [FRAMEWORK,SERVICE_TIMEOUT], " + "msg=%{public}s", result, keyMsg.c_str()); } int WatchdogTask::EvaluateCheckerState() @@ -230,7 +233,6 @@ int WatchdogTask::EvaluateCheckerState() } else { if (name.compare(IPC_FULL) == 0) { SendEvent(description, IPC_FULL); - DelayBeforeExit(7); // sleep 7s for binder dump } else { SendEvent(description, "SERVICE_BLOCK"); } -- Gitee