From 71e1916c73a2d8366fb059f1cf1aaeab85fadca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=A5=E7=BB=B4?= Date: Tue, 19 Aug 2025 10:39:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?description:=E5=88=A0=E9=99=A4=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3hitracechin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 查维 --- services/abilitymgr/src/ability_manager_proxy.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/services/abilitymgr/src/ability_manager_proxy.cpp b/services/abilitymgr/src/ability_manager_proxy.cpp index 8ab7a0ec36f..923a9018782 100644 --- a/services/abilitymgr/src/ability_manager_proxy.cpp +++ b/services/abilitymgr/src/ability_manager_proxy.cpp @@ -417,7 +417,6 @@ int AbilityManagerProxy::StartAbilityAsCaller(const Want &want, const sptr &token, int int AbilityManagerProxy::TerminateAbility(const sptr &token, int resultCode, const Want *resultWant, bool flag) { - Ability_MANAGER_HITRACE_CHAIN_NAME("TerminateAbility", HITRACE_FLAG_INCLUDE_ASYNC); int error; MessageParcel data; MessageParcel reply; @@ -1295,7 +1291,6 @@ int AbilityManagerProxy::SendResultToAbility(int32_t requestCode, int32_t result int AbilityManagerProxy::MoveAbilityToBackground(const sptr &token) { - Ability_MANAGER_HITRACE_CHAIN_NAME("MoveAbilityToBackground", HITRACE_FLAG_INCLUDE_ASYNC); int error; MessageParcel data; MessageParcel reply; @@ -3119,7 +3114,6 @@ int AbilityManagerProxy::CleanMission(int32_t missionId) int AbilityManagerProxy::CleanAllMissions() { - Ability_MANAGER_HITRACE_CHAIN_NAME("CleanAllMissions", HITRACE_FLAG_INCLUDE_ASYNC); HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); int error; MessageParcel data; @@ -3244,7 +3238,6 @@ int AbilityManagerProxy::MoveMissionsToBackground(const std::vector& mi int AbilityManagerProxy::StartUser(int userId, sptr callback, bool isAppRecovery) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StartUser", HITRACE_FLAG_INCLUDE_ASYNC); MessageParcel data; if (!WriteInterfaceToken(data)) { return INNER_ERR; @@ -3302,7 +3295,6 @@ int AbilityManagerProxy::SetMissionContinueState(const sptr &toke int AbilityManagerProxy::StopUser(int userId, const sptr &callback) { - Ability_MANAGER_HITRACE_CHAIN_NAME("StopUser", HITRACE_FLAG_INCLUDE_ASYNC); MessageParcel data; if (!WriteInterfaceToken(data)) { return INNER_ERR; @@ -3333,7 +3325,6 @@ int AbilityManagerProxy::StopUser(int userId, const sptr &callbac int AbilityManagerProxy::LogoutUser(int32_t userId, sptr callback) { - Ability_MANAGER_HITRACE_CHAIN_NAME("LogoutUser", HITRACE_FLAG_INCLUDE_ASYNC); MessageParcel data; MessageParcel reply; MessageOption option; @@ -4518,7 +4509,6 @@ int32_t AbilityManagerProxy::RequestDialogService(const Want &want, const sptr &callerToken) { - Ability_MANAGER_HITRACE_CHAIN_NAME("ReportDrawnCompleted", HITRACE_FLAG_INCLUDE_ASYNC); TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); if (callerToken == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "null callerToken"); @@ -5710,7 +5700,6 @@ int32_t AbilityManagerProxy::GetUIExtensionSessionInfo(const sptr int32_t AbilityManagerProxy::OpenAtomicService(Want& want, const StartOptions &options, sptr callerToken, int32_t requestCode, int32_t userId) { - Ability_MANAGER_HITRACE_CHAIN_NAME("OpenAtomicService", HITRACE_FLAG_INCLUDE_ASYNC); MessageParcel data; if (!WriteInterfaceToken(data)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "write token fail"); @@ -5999,7 +5988,6 @@ ErrCode AbilityManagerProxy::OpenLink(const Want& want, sptr call TAG_LOGW(AAFwkTag::ABILITYMGR, "forbid start: %{public}s", want.GetElement().GetBundleName().c_str()); return INNER_ERR; } - Ability_MANAGER_HITRACE_CHAIN_NAME("OpenLink", HITRACE_FLAG_INCLUDE_ASYNC); if (callerToken == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "null callerToken"); return INNER_ERR; -- Gitee From 9b0253d5f7e972ee7e37645a89dcbd9f7791db55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=A5=E7=BB=B4?= Date: Tue, 19 Aug 2025 15:16:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=BF=A1=E6=81=AF=E6=96=87=E4=BB=B6=E5=90=8E?= =?UTF-8?q?=E7=BC=80=E5=90=8D=E4=B8=8E=E8=A1=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 查维 --- services/common/include/hilog_tag_wrapper.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/common/include/hilog_tag_wrapper.h b/services/common/include/hilog_tag_wrapper.h index 5aaa6001aa8..87edbc95a06 100644 --- a/services/common/include/hilog_tag_wrapper.h +++ b/services/common/include/hilog_tag_wrapper.h @@ -17,12 +17,13 @@ #define OHOS_AAFWK_HILOG_TAG_WRAPPER_H #include +#include #include #include "hilog/log.h" #ifndef AAFWK_FUNC_FMT -#define AAFWK_FUNC_FMT "[%{public}s:%{public}d]" +#define AAFWK_FUNC_FMT "[%{public}s]" #endif #ifndef AAFWK_FILE_NAME @@ -31,7 +32,7 @@ #endif #ifndef AAFWK_FUNC_INFO -#define AAFWK_FUNC_INFO AAFWK_FILE_NAME, __LINE__ +#define AAFWK_FUNC_INFO std::filesystem::path(AAFWK_FILE_NAME).replace_extension().c_str() #endif -- Gitee