From dfdecbef32ed334d678c49afe43635785df32542 Mon Sep 17 00:00:00 2001 From: wlh2624_DS <1968860844@qq.com> Date: Mon, 29 Jun 2026 17:15:09 +0800 Subject: [PATCH] log cut Co-Authored-By: agent Signed-off-by: wlh2624_DS <1968860844@qq.com> --- .../app_service_extension_context.js | 4 ++-- .../service_extension_context.js | 4 ++-- .../ui_service_extension_context.js | 4 ++-- frameworks/js/napi/wantagent/napi_want_agent.cpp | 2 +- .../appkit/ability_runtime/context/context_impl.cpp | 2 +- .../ability_runtime/service_extension_context.cpp | 6 +++--- frameworks/native/appkit/app/main_thread.cpp | 10 +++++----- .../src/connect_server_manager.cpp | 6 +++--- services/abilitymgr/src/ability_manager_service.cpp | 2 +- services/abilitymgr/src/pending_want_manager.cpp | 4 ++-- .../src/ui_extension/preload_uiext_state_observer.cpp | 4 ++-- services/common/include/hilog_tag_wrapper.h | 6 ++++++ 12 files changed, 30 insertions(+), 24 deletions(-) diff --git a/frameworks/js/napi/app_service_extension_context/app_service_extension_context.js b/frameworks/js/napi/app_service_extension_context/app_service_extension_context.js index 99fb40c8e5..483d26f04c 100644 --- a/frameworks/js/napi/app_service_extension_context/app_service_extension_context.js +++ b/frameworks/js/napi/app_service_extension_context/app_service_extension_context.js @@ -24,12 +24,12 @@ class AppServiceExtensionContext extends ExtensionContext { } connectServiceExtensionAbility(want, options) { - hilog.sLogI(domainID, TAG, 'connectServiceExtensionAbility'); + hilog.sLogI(domainID, TAG, 'conSrvEA'); return this.__context_impl__.connectServiceExtensionAbility(want, options); } disconnectServiceExtensionAbility(connection) { - hilog.sLogI(domainID, TAG, 'disconnectServiceExtensionAbility'); + hilog.sLogI(domainID, TAG, 'disConSrvEA'); return this.__context_impl__.disconnectServiceExtensionAbility(connection); } diff --git a/frameworks/js/napi/service_extension_context/service_extension_context.js b/frameworks/js/napi/service_extension_context/service_extension_context.js index b2f172aa3f..1e5da6fce7 100644 --- a/frameworks/js/napi/service_extension_context/service_extension_context.js +++ b/frameworks/js/napi/service_extension_context/service_extension_context.js @@ -55,7 +55,7 @@ class ServiceExtensionContext extends ExtensionContext { } connectServiceExtensionAbility(want, options) { - hilog.sLogI(domainID, TAG, 'connectServiceExtensionAbility'); + hilog.sLogI(domainID, TAG, 'conSrvEA'); return this.__context_impl__.connectServiceExtensionAbility(want, options); } @@ -110,7 +110,7 @@ class ServiceExtensionContext extends ExtensionContext { } disconnectServiceExtensionAbility(connection, callback) { - hilog.sLogI(domainID, TAG, 'disconnectServiceExtensionAbility'); + hilog.sLogI(domainID, TAG, 'disConSrvEA'); return this.__context_impl__.disconnectServiceExtensionAbility(connection, callback); } diff --git a/frameworks/js/napi/ui_service_extension_context/ui_service_extension_context.js b/frameworks/js/napi/ui_service_extension_context/ui_service_extension_context.js index 612d02fc96..7c88da6384 100644 --- a/frameworks/js/napi/ui_service_extension_context/ui_service_extension_context.js +++ b/frameworks/js/napi/ui_service_extension_context/ui_service_extension_context.js @@ -40,12 +40,12 @@ class UIServiceExtensionContext extends ExtensionContext { } connectServiceExtensionAbility(want, options) { - hilog.sLogI(domainID, TAG, 'connectServiceExtensionAbility'); + hilog.sLogI(domainID, TAG, 'conSrvEA'); return this.__context_impl__.connectServiceExtensionAbility(want, options); } disconnectServiceExtensionAbility(connection, callback) { - hilog.sLogI(domainID, TAG, 'disconnectServiceExtensionAbility'); + hilog.sLogI(domainID, TAG, 'disConSrvEA'); return this.__context_impl__.disconnectServiceExtensionAbility(connection, callback); } } diff --git a/frameworks/js/napi/wantagent/napi_want_agent.cpp b/frameworks/js/napi/wantagent/napi_want_agent.cpp index f8ec2922aa..18d9fa6b17 100644 --- a/frameworks/js/napi/wantagent/napi_want_agent.cpp +++ b/frameworks/js/napi/wantagent/napi_want_agent.cpp @@ -575,7 +575,7 @@ void JsWantAgent::SetOnGetBundleNameCallback(std::shared_ptr wantAgen auto retCode = std::make_shared(NO_ERROR); auto bundleName = std::make_shared(); execute = [wantAgent, retCode, bundleName] () { - TAG_LOGI(AAFwkTag::WANTAGENT, "get bundle name callback"); + TAG_LOGD(AAFwkTag::WANTAGENT, "get bundle name callback"); *retCode = WantAgentHelper::GetBundleName(wantAgent, *bundleName); }; complete = [retCode, bundleName](napi_env env, NapiAsyncTask &task, int32_t status) { diff --git a/frameworks/native/appkit/ability_runtime/context/context_impl.cpp b/frameworks/native/appkit/ability_runtime/context/context_impl.cpp index 193de82fc2..0879f77393 100644 --- a/frameworks/native/appkit/ability_runtime/context/context_impl.cpp +++ b/frameworks/native/appkit/ability_runtime/context/context_impl.cpp @@ -1122,7 +1122,7 @@ void ContextImpl::GetOverlayPath(std::shared_ptr overlayModuleInfos; auto res = GetOverlayModuleInfos(bundleName, moduleName, overlayModuleInfos); if (res != ERR_OK) { - TAG_LOGE(AAFwkTag::APPKIT, "Get overlay paths from bms failed."); + TAG_LOGD(AAFwkTag::APPKIT, "Get overlay paths from bms failed."); } if (overlayModuleInfos.size() == 0) { if (!resourceManager->AddResource(loadPath.c_str())) { diff --git a/frameworks/native/appkit/ability_runtime/service_extension_context.cpp b/frameworks/native/appkit/ability_runtime/service_extension_context.cpp index decaad4755..d7e8770813 100644 --- a/frameworks/native/appkit/ability_runtime/service_extension_context.cpp +++ b/frameworks/native/appkit/ability_runtime/service_extension_context.cpp @@ -208,17 +208,17 @@ ErrCode ServiceExtensionContext::StopServiceExtensionAbility(const AAFwk::Want& ErrCode ServiceExtensionContext::ConnectAbilityWithAccount( const AAFwk::Want &want, int32_t accountId, const sptr &connectCallback) const { - TAG_LOGI(AAFwkTag::APPKIT, "begin"); + TAG_LOGD(AAFwkTag::APPKIT, "begin"); ErrCode ret = ConnectionManager::GetInstance().ConnectAbilityWithAccount(token_, want, accountId, connectCallback); - TAG_LOGI(AAFwkTag::APPKIT, "ConnectAbilityWithAccount ErrorCode = %{public}d", ret); + TAG_LOGI(AAFwkTag::APPKIT, "ConAbiWithAcc:%{public}d", ret); return ret; } ErrCode ServiceExtensionContext::DisconnectAbility(const AAFwk::Want &want, const sptr &connectCallback, int32_t accountId) const { - TAG_LOGI(AAFwkTag::APPKIT, "Disconnect c:%{public}s, t:%{public}s", + TAG_LOGI(AAFwkTag::APPKIT, "DisCon %{public}s,%{public}s", GetAbilityInfo() == nullptr ? "" : GetAbilityInfo()->name.c_str(), want.GetElement().GetAbilityName().c_str()); ErrCode ret = ConnectionManager::GetInstance().DisconnectAbility(token_, want, connectCallback, accountId); diff --git a/frameworks/native/appkit/app/main_thread.cpp b/frameworks/native/appkit/app/main_thread.cpp index 1ff1c32104..c222a0448c 100644 --- a/frameworks/native/appkit/app/main_thread.cpp +++ b/frameworks/native/appkit/app/main_thread.cpp @@ -850,7 +850,7 @@ void MainThread::ScheduleLaunchAbility(const AbilityInfo &info, const sptr &want, int32_t abilityRecordId, const std::shared_ptr updateInfo) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::APPKIT, "%{public}s called, ability %{public}s, type is %{public}d.", + TAG_LOGI(AAFwkTag::APPKIT, "%{public}s called,ability %{public}s,%{public}d", __func__, info.name.c_str(), info.type); bool skipAbilityStageLifecycle = false; @@ -1902,8 +1902,8 @@ void MainThread::HandleLaunchApplication(const AppLaunchData &appLaunchData, con options.enableWarmStartupSmartGC = (appLaunchData.GetAppPreloadMode() == AppExecFwk::PreloadMode::PRE_MAKE || appLaunchData.GetAppPreloadMode() == AppExecFwk::PreloadMode::PRELOAD_MODULE); - TAG_LOGI(AAFwkTag::APPKIT, "SmartGC: process is start. enable warm startup SmartGC: %{public}d" - " version:%{public}u", static_cast(options.enableWarmStartupSmartGC), bundleInfo.versionCode); + TAG_LOGI(AAFwkTag::APPKIT, "SmartGC:%{public}d version:%{public}u", + static_cast(options.enableWarmStartupSmartGC), bundleInfo.versionCode); auto perfCmd = appLaunchData.GetPerfCmd(); auto findPos = perfCmd.find(BASE_LINE_PERFCMD); if (findPos != std::string::npos && (appLaunchData.GetDebugFromLocal() || isDeveloperMode_)) { @@ -2850,7 +2850,7 @@ void MainThread::HandleLaunchAbility(const std::shared_ptr & UpdateWorkProcessInfo(updateInfo); if (needNotifyApplicationPreAbilityCreate) { - TAG_LOGI(AAFwkTag::APPKIT, "NotifyApplicationPreAbilityCreate"); + TAG_LOGI(AAFwkTag::APPKIT, "NtfyAppPreAbiCreate"); AppExecFwk::AppImageObserverManager::GetInstance().NotifyApplicationPreAbilityCreate(); } @@ -2981,7 +2981,7 @@ void MainThread::HandleCleanAbility(const sptr &token, bool isCac TAG_LOGE(AAFwkTag::APPKIT, "null applicationInfo"); return; } - TAG_LOGI(AAFwkTag::APPKIT, "Handle clean ability start, app is %{public}s.", applicationInfo_->name.c_str()); + TAG_LOGD(AAFwkTag::APPKIT, "Handle clean ability start, app is %{public}s.", applicationInfo_->name.c_str()); if (!IsApplicationReady()) { TAG_LOGE(AAFwkTag::APPKIT, "should launch application first"); diff --git a/interfaces/inner_api/connect_server_manager/src/connect_server_manager.cpp b/interfaces/inner_api/connect_server_manager/src/connect_server_manager.cpp index 8b41983e0b..151de417bd 100644 --- a/interfaces/inner_api/connect_server_manager/src/connect_server_manager.cpp +++ b/interfaces/inner_api/connect_server_manager/src/connect_server_manager.cpp @@ -159,7 +159,7 @@ void ConnectServerManager::StoreDebuggerInfo(int32_t tid, void* vm, const panda: } if (!isConnected_) { - TAG_LOGW(AAFwkTag::JSRUNTIME, "not Connected"); + TAG_LOGW(AAFwkTag::JSRUNTIME, "disCon"); return; } @@ -308,7 +308,7 @@ void ConnectServerManager::RemoveInstance(int32_t instanceId) } if (!isConnected_) { - TAG_LOGW(AAFwkTag::JSRUNTIME, "not Connected"); + TAG_LOGW(AAFwkTag::JSRUNTIME, "disCon"); return; } @@ -490,4 +490,4 @@ void ConnectServerManager::SendInstanceMessageAll(std::function &target) { - TAG_LOGI(AAFwkTag::WANTAGENT, "%{public}s:begin", __func__); + TAG_LOGD(AAFwkTag::WANTAGENT, "%{public}s:begin", __func__); if (target == nullptr) { TAG_LOGE(AAFwkTag::WANTAGENT, "%s, target null", __func__); return -1; diff --git a/services/abilitymgr/src/pending_want_manager.cpp b/services/abilitymgr/src/pending_want_manager.cpp index f7654c0320..ed8789ded9 100644 --- a/services/abilitymgr/src/pending_want_manager.cpp +++ b/services/abilitymgr/src/pending_want_manager.cpp @@ -169,7 +169,7 @@ sptr PendingWantManager::GetWantSenderLocked(const int32_t callingU int32_t publisherUid) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::WANTAGENT, "begin"); + TAG_LOGD(AAFwkTag::WANTAGENT, "begin"); bool needCreate = (static_cast(wantSenderInfo.flags) & static_cast(Flags::NO_BUILD_FLAG)) == 0; @@ -249,7 +249,7 @@ void PendingWantManager::MakeWantSenderCanceledLocked(PendingWantRecord &record) sptr PendingWantManager::GetPendingWantRecordByKey(const std::shared_ptr &key) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::WANTAGENT, "begin"); + TAG_LOGD(AAFwkTag::WANTAGENT, "begin"); for (const auto &item : wantRecords_) { const auto pendingKey = item.first; const auto pendingRecord = item.second; diff --git a/services/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp b/services/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp index 0e912ed77e..572f06005f 100644 --- a/services/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp +++ b/services/abilitymgr/src/ui_extension/preload_uiext_state_observer.cpp @@ -38,7 +38,7 @@ void PreLoadUIExtStateObserver::OnProcessDied(const AppExecFwk::ProcessData &pro } extensionRecord->UnloadUIExtensionAbility(); } else { - TAG_LOGW(AAFwkTag::UI_EXT, "extensionRecord null"); + TAG_LOGW(AAFwkTag::UI_EXT, "null"); } } @@ -59,4 +59,4 @@ void PreLoadUIExtStateObserver::OnAppCacheStateChanged(const AppExecFwk::AppStat } } } // namespace AAFwk -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/common/include/hilog_tag_wrapper.h b/services/common/include/hilog_tag_wrapper.h index efce437741..343206398f 100644 --- a/services/common/include/hilog_tag_wrapper.h +++ b/services/common/include/hilog_tag_wrapper.h @@ -239,6 +239,12 @@ static bool ConvertFileName(const std::string& fileBaseName, std::string& abbrFi abbrFileName = "AMSCHE"; } else if (fileBaseName == "base_extension_record") { abbrFileName = "BER"; + } else if (fileBaseName == "napi_want_agent") { + abbrFileName = "NWA"; + } else if (fileBaseName == "pending_want_manager") { + abbrFileName = "PWM"; + } else if (fileBaseName == "want_agent_helper") { + abbrFileName = "WAH"; } else if (fileBaseName == "connection_manager") { abbrFileName = "CONM"; } else {