From 9e4e0641cb0acabe99d76072c9ffce0f1462e264 Mon Sep 17 00:00:00 2001 From: chenxinzhan Date: Wed, 7 Aug 2024 10:56:54 +0800 Subject: [PATCH 1/8] modify abilitymgr log Signed-off-by: chenxinzhan --- services/abilitymgr/include/ability_util.h | 10 +++---- .../abilitymgr/src/ability_cache_manager.cpp | 2 +- .../src/ability_connect_manager.cpp | 28 +++++++++---------- .../abilitymgr/src/ability_manager_client.cpp | 2 +- .../src/ability_manager_service.cpp | 14 +++++----- services/abilitymgr/src/ability_record.cpp | 6 ++-- .../interceptor/crowd_test_interceptor.cpp | 2 +- .../src/resident_process_manager.cpp | 2 +- .../ui_ability_lifecycle_manager.cpp | 2 +- 9 files changed, 34 insertions(+), 34 deletions(-) diff --git a/services/abilitymgr/include/ability_util.h b/services/abilitymgr/include/ability_util.h index de1be2c4b66..a247454029b 100644 --- a/services/abilitymgr/include/ability_util.h +++ b/services/abilitymgr/include/ability_util.h @@ -54,19 +54,19 @@ constexpr const char* JUMP_INTERCEPTOR_DIALOG_CALLER_PKG = "interceptor_callerPk #define CHECK_POINTER_CONTINUE(object) \ if (!object) { \ - TAG_LOGE(AAFwkTag::ABILITYMGR, "null pointer"); \ + TAG_LOGE(AAFwkTag::ABILITYMGR, "nullptr"); \ continue; \ } #define CHECK_POINTER_IS_NULLPTR(object) \ if (object == nullptr) { \ - TAG_LOGE(AAFwkTag::ABILITYMGR, "null pointer"); \ + TAG_LOGE(AAFwkTag::ABILITYMGR, "nullptr"); \ return; \ } #define CHECK_POINTER(object) \ if (!object) { \ - TAG_LOGE(AAFwkTag::ABILITYMGR, "null pointer"); \ + TAG_LOGE(AAFwkTag::ABILITYMGR, "nullptr"); \ return; \ } @@ -78,7 +78,7 @@ constexpr const char* JUMP_INTERCEPTOR_DIALOG_CALLER_PKG = "interceptor_callerPk #define CHECK_POINTER_AND_RETURN(object, value) \ if (!object) { \ - TAG_LOGE(AAFwkTag::ABILITYMGR, "null pointer"); \ + TAG_LOGE(AAFwkTag::ABILITYMGR, "nullptr"); \ return value; \ } @@ -90,7 +90,7 @@ constexpr const char* JUMP_INTERCEPTOR_DIALOG_CALLER_PKG = "interceptor_callerPk #define CHECK_POINTER_RETURN_BOOL(object) \ if (!object) { \ - TAG_LOGE(AAFwkTag::ABILITYMGR, "null pointer"); \ + TAG_LOGE(AAFwkTag::ABILITYMGR, "nullptr"); \ return false; \ } diff --git a/services/abilitymgr/src/ability_cache_manager.cpp b/services/abilitymgr/src/ability_cache_manager.cpp index 19c2dd83809..28d94a377ad 100644 --- a/services/abilitymgr/src/ability_cache_manager.cpp +++ b/services/abilitymgr/src/ability_cache_manager.cpp @@ -59,7 +59,7 @@ void AbilityCacheManager::RemoveAbilityRecInProcList(std::shared_ptrGetApplicationInfo().accessTokenId; auto findProcInfo = procLruMap_.find(accessTokenId); if (findProcInfo == procLruMap_.end()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Can't found the abilityRecord in process list for remove."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Can't find record"); return; } auto it = findProcInfo->second.recList.begin(); diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index 9d16cb8fe7b..a84f4cdf632 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -231,7 +231,7 @@ int AbilityConnectManager::StartAbilityLocked(const AbilityRequest &abilityReque GetOrCreateServiceRecord(abilityRequest, false, targetService, isLoadedAbility); } CHECK_POINTER_AND_RETURN(targetService, ERR_INVALID_VALUE); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Start ability: %{public}s", targetService->GetURI().c_str()); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Start ability:%{public}s", targetService->GetURI().c_str()); targetService->AddCallerRecord(abilityRequest.callerToken, abilityRequest.requestCode); @@ -719,7 +719,7 @@ int AbilityConnectManager::DisconnectAbilityLocked(const sptr abilityRecord) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "called"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); if (!GetAbilityRecordById(abilityRecord->GetRecordId()) && !AbilityCacheManager::GetInstance().FindRecordByToken(abilityRecord->GetToken())) { return; @@ -790,7 +790,7 @@ int AbilityConnectManager::DisconnectRecordNormal(ConnectListType &list, } if (connectRecord->GetConnectState() == ConnectionState::DISCONNECTED) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "This record: %{public}d complete disconnect directly.", + TAG_LOGW(AAFwkTag::ABILITYMGR, "disconnect record:%{public}d", connectRecord->GetRecordId()); connectRecord->CompleteDisconnect(ERR_OK, callerDied); list.emplace_back(connectRecord); @@ -830,7 +830,7 @@ int AbilityConnectManager::AttachAbilityThreadLocked( } CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); std::string element = abilityRecord->GetURI(); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Ability: %{public}s", element.c_str()); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Ability:%{public}s", element.c_str()); if (taskHandler_ != nullptr) { int recordId = abilityRecord->GetRecordId(); std::string taskName = std::string("LoadTimeout_") + std::to_string(recordId); @@ -934,7 +934,7 @@ int AbilityConnectManager::AbilityTransitionDone(const sptr &toke } CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); std::string element = abilityRecord->GetURI(); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Ability: %{public}s, state: %{public}s", element.c_str(), abilityState.c_str()); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Ability:%{public}s, state:%{public}s", element.c_str(), abilityState.c_str()); switch (targetState) { case AbilityState::INACTIVE: { @@ -1187,8 +1187,8 @@ int AbilityConnectManager::ScheduleCommandAbilityWindowDone( auto abilityRecord = Token::GetAbilityRecordByToken(token); CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); std::string element = abilityRecord->GetURI(); - TAG_LOGI(AAFwkTag::ABILITYMGR, - "Ability: %{public}s, persistentId: %{private}d, winCmd: %{public}d, abilityCmd: %{public}d", element.c_str(), + TAG_LOGD(AAFwkTag::ABILITYMGR, + "Ability:%{public}s, persistentId:%{private}d, winCmd:%{public}d, abilityCmd:%{public}d", element.c_str(), sessionInfo->persistentId, winCmd, abilityCmd); // Only foreground mode need cancel, cause only foreground CommandAbilityWindow post timeout task. @@ -1852,8 +1852,8 @@ void AbilityConnectManager::DoBackgroundAbilityWindow(const std::shared_ptrConvertAbilityState(abilityRecord->GetAbilityState()); - TAG_LOGI(AAFwkTag::ABILITYMGR, - "Background ability: %{public}s, persistentId: %{public}d, abilityState: %{public}s", + TAG_LOGD(AAFwkTag::ABILITYMGR, + "Background ability:%{public}s, persistentId:%{public}d, abilityState:%{public}s", abilityRecord->GetURI().c_str(), sessionInfo->persistentId, abilitystateStr.c_str()); if (abilityRecord->IsAbilityState(AbilityState::FOREGROUND)) { MoveToBackground(abilityRecord); @@ -1873,8 +1873,8 @@ void AbilityConnectManager::TerminateAbilityWindowLocked(const std::shared_ptrConvertAbilityState(abilityRecord->GetAbilityState()); - TAG_LOGI(AAFwkTag::ABILITYMGR, - "Terminate ability: %{public}s, persistentId: %{public}d, abilityState: %{public}s", + TAG_LOGD(AAFwkTag::ABILITYMGR, + "Terminate ability:%{public}s, persistentId:%{public}d, abilityState:%{public}s", abilityRecord->GetURI().c_str(), sessionInfo->persistentId, abilitystateStr.c_str()); EventInfo eventInfo; eventInfo.bundleName = abilityRecord->GetAbilityInfo().bundleName; @@ -2956,7 +2956,7 @@ void AbilityConnectManager::HandleProcessFrozen(const std::vector &pidL TAG_LOGE(AAFwkTag::ABILITYMGR, "taskHandler null"); return; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "HandleProcessFrozen: %{public}d", uid); + TAG_LOGD(AAFwkTag::ABILITYMGR, "HandleProcessFrozen:%{public}d", uid); std::unordered_set pidSet(pidList.begin(), pidList.end()); std::lock_guard lock(serviceMapMutex_); auto weakThis = weak_from_this(); @@ -2971,7 +2971,7 @@ void AbilityConnectManager::HandleProcessFrozen(const std::vector &pidL taskHandler->SubmitTask([weakThis, record = abilityRecord]() { auto connectManager = weakThis.lock(); if (record && connectManager) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "TerminateRecord: %{public}s", + TAG_LOGI(AAFwkTag::ABILITYMGR, "TerminateRecord:%{public}s", record->GetAbilityInfo().bundleName.c_str()); connectManager->TerminateRecord(record); } else { diff --git a/services/abilitymgr/src/ability_manager_client.cpp b/services/abilitymgr/src/ability_manager_client.cpp index 7af72e00fc0..27c11dc62c1 100644 --- a/services/abilitymgr/src/ability_manager_client.cpp +++ b/services/abilitymgr/src/ability_manager_client.cpp @@ -332,7 +332,7 @@ ErrCode AbilityManagerClient::StartUIExtensionAbility(sptr extensio auto abms = GetAbilityManager(); CHECK_POINTER_RETURN_NOT_CONNECTED(abms); CHECK_POINTER_RETURN_INVALID_VALUE(extensionSessionInfo); - TAG_LOGI(AAFwkTag::ABILITYMGR, "name: %{public}s %{public}s, persistentId: %{public}d, userId: %{public}d.", + TAG_LOGD(AAFwkTag::ABILITYMGR, "name:%{public}s %{public}s, persistentId:%{public}d, userId:%{public}d", extensionSessionInfo->want.GetElement().GetAbilityName().c_str(), extensionSessionInfo->want.GetElement().GetBundleName().c_str(), extensionSessionInfo->persistentId, userId); return abms->StartUIExtensionAbility(extensionSessionInfo, userId); diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 1ea1d4b012e..5c66af5988b 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -3695,8 +3695,8 @@ int AbilityManagerService::ConnectAbilityCommon( AppExecFwk::ExtensionAbilityType extensionType, int32_t userId, bool isQueryExtensionOnly) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, - "Connect ability called, element uri: %{public}s.", want.GetElement().GetURI().c_str()); + TAG_LOGD(AAFwkTag::ABILITYMGR, + "call, element uri:%{public}s.", want.GetElement().GetURI().c_str()); CHECK_POINTER_AND_RETURN(connect, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(connect->AsObject(), ERR_INVALID_VALUE); if (extensionType == AppExecFwk::ExtensionAbilityType::SERVICE && IsCrossUserCall(userId)) { @@ -4081,7 +4081,7 @@ int AbilityManagerService::DisconnectLocalAbility(const sptr int AbilityManagerService::DisconnectRemoteAbility(const sptr &connect) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s begin DisconnectAbilityRemote", __func__); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); int32_t callerUid = IPCSkeleton::GetCallingUid(); uint32_t accessToken = IPCSkeleton::GetCallingTokenID(); DistributedClient dmsClient; @@ -5589,7 +5589,7 @@ int AbilityManagerService::AbilityTransitionDone(const sptr &toke } auto abilityInfo = abilityRecord->GetAbilityInfo(); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Lifecycle: ability: %{public}s.", abilityRecord->GetURI().c_str()); + TAG_LOGD(AAFwkTag::ABILITYMGR, "ability: %{public}s.", abilityRecord->GetURI().c_str()); auto type = abilityInfo.type; auto userId = abilityRecord->GetApplicationInfo().uid / BASE_USER_RANGE; // force timeout ability for test @@ -5661,7 +5661,7 @@ int AbilityManagerService::AbilityWindowConfigTransitionDone( return CHECK_PERMISSION_FAILED; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "Lifecycle: ability: %{public}s.", abilityRecord->GetURI().c_str()); + TAG_LOGD(AAFwkTag::ABILITYMGR, "ability:%{public}s", abilityRecord->GetURI().c_str()); auto abilityInfo = abilityRecord->GetAbilityInfo(); auto type = abilityInfo.extensionAbilityType; if (type != AppExecFwk::ExtensionAbilityType::UI_SERVICE) { @@ -5709,7 +5709,7 @@ int AbilityManagerService::ScheduleConnectAbilityDone( int AbilityManagerService::ScheduleDisconnectAbilityDone(const sptr &token) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Schedule disconnect ability done."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); if (!VerificationAllToken(token)) { return ERR_INVALID_VALUE; } @@ -11303,7 +11303,7 @@ void AbilityManagerService::GetRunningMultiAppIndex(const std::string &bundleNam } auto ret = IN_PROCESS_CALL(appMgr->GetRunningMultiAppInfoByBundleName(bundleName, runningMultiAppInfo)); if (ret != ERR_OK) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "GetRunningMultiAppInfo failed bundleName = %{public}s", + TAG_LOGW(AAFwkTag::ABILITYMGR, "GetAppInfo failed, bundle:%{public}s", bundleName.c_str()); } for (auto &item : runningMultiAppInfo.runningAppClones) { diff --git a/services/abilitymgr/src/ability_record.cpp b/services/abilitymgr/src/ability_record.cpp index f145f1cc77c..d7a1bbb4ee7 100644 --- a/services/abilitymgr/src/ability_record.cpp +++ b/services/abilitymgr/src/ability_record.cpp @@ -140,7 +140,7 @@ std::shared_ptr Token::GetAbilityRecordByToken(const sptrGetObjectDescriptor()); if (descriptor != "ohos.aafwk.AbilityToken") { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Input token is not an AbilityToken, token->GetObjectDescriptor(): %{public}s", + TAG_LOGE(AAFwkTag::ABILITYMGR, "not AbilityToken, descriptor:%{public}s", descriptor.c_str()); return nullptr; } @@ -400,7 +400,7 @@ void AbilityRecord::ForegroundAbility(uint32_t sceneFlag) void AbilityRecord::ForegroundAbility(const Closure &task, uint32_t sceneFlag) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, "ability: %{public}s.", GetURI().c_str()); + TAG_LOGD(AAFwkTag::ABILITYMGR, "ability:%{public}s", GetURI().c_str()); CHECK_POINTER(lifecycleDeal_); // grant uri permission { @@ -1183,7 +1183,7 @@ void AbilityRecord::SetColdStartFlag(bool isColdStart) void AbilityRecord::BackgroundAbility(const Closure &task) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, "BackgroundLifecycle: ability: %{public}s.", GetURI().c_str()); + TAG_LOGD(AAFwkTag::ABILITYMGR, "ability:%{public}s.", GetURI().c_str()); if (lifecycleDeal_ == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Move the ability to background fail, lifecycleDeal_ is null."); return; diff --git a/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp b/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp index a5f96f069db..2b4f70f06bc 100644 --- a/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/crowd_test_interceptor.cpp @@ -51,7 +51,7 @@ bool CrowdTestInterceptor::CheckCrowdtest(const Want &want, int32_t userId) // get crowdtest status and time AppExecFwk::ApplicationInfo appInfo; if (!StartAbilityUtils::GetApplicationInfo(want.GetBundle(), userId, appInfo)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed to get application info."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "GetAppInfo failed"); return false; } diff --git a/services/abilitymgr/src/resident_process_manager.cpp b/services/abilitymgr/src/resident_process_manager.cpp index e53b902893c..932ae3fe601 100644 --- a/services/abilitymgr/src/resident_process_manager.cpp +++ b/services/abilitymgr/src/resident_process_manager.cpp @@ -157,7 +157,7 @@ int32_t ResidentProcessManager::SetResidentProcessEnabled( bool localEnable = false; rdbResult = rdb.GetResidentProcessEnable(bundleName, localEnable); if (rdbResult != Rdb_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to obtain resident process properties. result: %{public}d", rdbResult); + TAG_LOGE(AAFwkTag::ABILITYMGR, "GetResidentProcess failed:%{public}d", rdbResult); return INNER_ERR; } diff --git a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp index c6d71a47280..9afa5ec40d9 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -82,7 +82,7 @@ int UIAbilityLifecycleManager::StartUIAbility(AbilityRequest &abilityRequest, sp } abilityRequest.sessionInfo = sessionInfo; - TAG_LOGI(AAFwkTag::ABILITYMGR, "session id: %{public}d. bundle: %{public}s, ability: %{public}s", + TAG_LOGD(AAFwkTag::ABILITYMGR, "session id:%{public}d. bundle:%{public}s, ability:%{public}s", sessionInfo->persistentId, abilityRequest.abilityInfo.bundleName.c_str(), abilityRequest.abilityInfo.name.c_str()); std::shared_ptr uiAbilityRecord = nullptr; -- Gitee From 2520a1ec039f5282434a0832f2defeff01e1935e Mon Sep 17 00:00:00 2001 From: chenxinzhan Date: Wed, 7 Aug 2024 14:38:54 +0800 Subject: [PATCH 2/8] simplify Signed-off-by: chenxinzhan --- frameworks/native/appkit/app/main_thread.cpp | 2 +- services/abilitymgr/src/ability_connect_manager.cpp | 4 ++-- services/abilitymgr/src/ability_manager_service.cpp | 10 +++++----- services/abilitymgr/src/ability_record.cpp | 6 +++--- services/abilitymgr/src/start_ability_utils.cpp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/frameworks/native/appkit/app/main_thread.cpp b/frameworks/native/appkit/app/main_thread.cpp index fdac8534aeb..38e5997ea15 100644 --- a/frameworks/native/appkit/app/main_thread.cpp +++ b/frameworks/native/appkit/app/main_thread.cpp @@ -3433,7 +3433,7 @@ void MainThread::ParseAppConfigurationParams(const std::string configuration, Co TAG_LOGD(AAFwkTag::APPKIT, "start"); appConfig.AddItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE, DEFAULT_APP_FONT_SIZE_SCALE); if (configuration.empty()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "emptye config"); + TAG_LOGE(AAFwkTag::ABILITYMGR, "empty configuration"); return; } nlohmann::json configurationJson = nlohmann::json::parse(configuration, nullptr, false); diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index a84f4cdf632..9fce63b6728 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -1973,7 +1973,7 @@ void AbilityConnectManager::AddConnectDeathRecipient(sptr connect } }); if (!connectObject->AddDeathRecipient(deathRecipient)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed"); return; } std::lock_guard guard(recipientMapMutex_); @@ -2842,7 +2842,7 @@ void AbilityConnectManager::AddUIExtWindowDeathRecipient(const sptrAddDeathRecipient(deathRecipient)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed"); } uiExtRecipientMap_.emplace(session, deathRecipient); } diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 5c66af5988b..a5e89317470 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -2469,9 +2469,9 @@ void AbilityManagerService::ReportAbilitStartInfoToRSS(const AppExecFwk::Ability void AbilityManagerService::ReportAbilitAssociatedStartInfoToRSS( const AppExecFwk::AbilityInfo &abilityInfo, int64_t type, const sptr &callerToken) { - CHECK_POINTER_LOG(callerToken, "associated start caller token is nullptr"); + CHECK_POINTER_LOG(callerToken, "null callerToken"); auto callerAbility = Token::GetAbilityRecordByToken(callerToken); - CHECK_POINTER_LOG(callerAbility, "associated start caller ability is nullptr"); + CHECK_POINTER_LOG(callerAbility, "null callerAbility"); int32_t callerUid = callerAbility->GetUid(); int32_t callerPid = callerAbility->GetPid(); ResSchedUtil::GetInstance().ReportAbilitAssociatedStartInfoToRSS(abilityInfo, type, callerUid, callerPid); @@ -2549,7 +2549,7 @@ int AbilityManagerService::PreloadUIExtensionAbilityInner(const Want &want, std: ErrCode result = ERR_OK; result = GenerateExtensionAbilityRequest(want, abilityRequest, nullptr, validUserId); if (result != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate ability request error."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate abilityReq error"); return result; } abilityRequest.extensionType = abilityRequest.abilityInfo.extensionAbilityType; @@ -4487,7 +4487,7 @@ int AbilityManagerService::GetPendingWantUserId(const sptr &target) std::string AbilityManagerService::GetPendingWantBundleName(const sptr &target) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "Get pending want bundle name."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); AbilityManagerXCollie abilityManagerXCollie("AbilityManagerService::GetPendingWantBundleName"); auto pendingWantManager = GetCurrentPendingWantManager(); CHECK_POINTER_AND_RETURN(pendingWantManager, ""); @@ -4509,7 +4509,7 @@ int AbilityManagerService::GetPendingWantCode(const sptr &target) int AbilityManagerService::GetPendingWantType(const sptr &target) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s:begin.", __func__); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); AbilityManagerXCollie abilityManagerXCollie("AbilityManagerService::GetPendingWantType"); auto pendingWantManager = GetCurrentPendingWantManager(); CHECK_POINTER_AND_RETURN(pendingWantManager, -1); diff --git a/services/abilitymgr/src/ability_record.cpp b/services/abilitymgr/src/ability_record.cpp index d7a1bbb4ee7..f121bfdc503 100644 --- a/services/abilitymgr/src/ability_record.cpp +++ b/services/abilitymgr/src/ability_record.cpp @@ -1316,7 +1316,7 @@ void AbilityRecord::SetAbilityStateInner(AbilityState state) auto collaborator = DelayedSingleton::GetInstance()->GetCollaborator( collaboratorType_); if (collaborator != nullptr) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "start notify collaborator, missionId:%{public}d, state:%{public}d", missionId_, + TAG_LOGD(AAFwkTag::ABILITYMGR, "notify collaborator, missionId:%{public}d, state:%{public}d", missionId_, static_cast(state)); int ret = ERR_OK; if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { @@ -1687,7 +1687,7 @@ void AbilityRecord::SaveAbilityState() void AbilityRecord::SaveAbilityState(const PacMap &inState) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); stateDatas_ = inState; } @@ -2013,7 +2013,7 @@ void AbilityRecord::AddCallerRecord(const sptr &callerToken, int uint32_t callingTokenId) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Add caller record, callingTokenId is %{public}u", callingTokenId); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call, callingTokenId:%{public}u", callingTokenId); if (!srcAbilityId.empty() && IsSystemAbilityCall(callerToken, callingTokenId)) { AddSystemAbilityCallerRecord(callerToken, requestCode, srcAbilityId); return; diff --git a/services/abilitymgr/src/start_ability_utils.cpp b/services/abilitymgr/src/start_ability_utils.cpp index 16d5bb94f5d..eb9cd576b87 100644 --- a/services/abilitymgr/src/start_ability_utils.cpp +++ b/services/abilitymgr/src/start_ability_utils.cpp @@ -50,7 +50,7 @@ bool StartAbilityUtils::GetAppIndex(const Want &want, sptr caller appIndex = abilityRecord->GetAppIndex(); return true; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "appCloneIndex: %{public}d.", want.GetIntParam(Want::PARAM_APP_CLONE_INDEX_KEY, 0)); + TAG_LOGD(AAFwkTag::ABILITYMGR, "appCloneIndex:%{public}d", want.GetIntParam(Want::PARAM_APP_CLONE_INDEX_KEY, 0)); return AbilityRuntime::StartupUtil::GetAppIndex(want, appIndex); } @@ -224,7 +224,7 @@ std::shared_ptr StartAbilityInfo::CreateStartAbilityInfo(const abilityInfoFlag, userId, extensionInfos)); } if (extensionInfos.size() <= 0) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Get extension info failed."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Get extensionInfo failed"); request->status = RESOLVE_ABILITY_ERR; return request; } -- Gitee From 814716687a018bb1c62b6bf4a0c0b97cbc0714b8 Mon Sep 17 00:00:00 2001 From: chenxinzhan Date: Wed, 7 Aug 2024 15:24:15 +0800 Subject: [PATCH 3/8] handle issue Signed-off-by: chenxinzhan --- .../abilitymgr/src/ability_connect_manager.cpp | 18 +++++++++--------- .../abilitymgr/src/ability_manager_service.cpp | 8 ++++---- services/abilitymgr/src/ability_record.cpp | 4 ++-- .../ui_ability_lifecycle_manager.cpp | 2 +- .../abilitymgr/src/start_ability_utils.cpp | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index 9fce63b6728..92635d38946 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -231,7 +231,7 @@ int AbilityConnectManager::StartAbilityLocked(const AbilityRequest &abilityReque GetOrCreateServiceRecord(abilityRequest, false, targetService, isLoadedAbility); } CHECK_POINTER_AND_RETURN(targetService, ERR_INVALID_VALUE); - TAG_LOGD(AAFwkTag::ABILITYMGR, "Start ability:%{public}s", targetService->GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "StartAbility:%{public}s", targetService->GetURI().c_str()); targetService->AddCallerRecord(abilityRequest.callerToken, abilityRequest.requestCode); @@ -830,7 +830,7 @@ int AbilityConnectManager::AttachAbilityThreadLocked( } CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); std::string element = abilityRecord->GetURI(); - TAG_LOGD(AAFwkTag::ABILITYMGR, "Ability:%{public}s", element.c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "Ability:%{public}s", element.c_str()); if (taskHandler_ != nullptr) { int recordId = abilityRecord->GetRecordId(); std::string taskName = std::string("LoadTimeout_") + std::to_string(recordId); @@ -934,7 +934,7 @@ int AbilityConnectManager::AbilityTransitionDone(const sptr &toke } CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); std::string element = abilityRecord->GetURI(); - TAG_LOGD(AAFwkTag::ABILITYMGR, "Ability:%{public}s, state:%{public}s", element.c_str(), abilityState.c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "Ability:%{public}s, state:%{public}s", element.c_str(), abilityState.c_str()); switch (targetState) { case AbilityState::INACTIVE: { @@ -1187,7 +1187,7 @@ int AbilityConnectManager::ScheduleCommandAbilityWindowDone( auto abilityRecord = Token::GetAbilityRecordByToken(token); CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); std::string element = abilityRecord->GetURI(); - TAG_LOGD(AAFwkTag::ABILITYMGR, + TAG_LOGI(AAFwkTag::ABILITYMGR, "Ability:%{public}s, persistentId:%{private}d, winCmd:%{public}d, abilityCmd:%{public}d", element.c_str(), sessionInfo->persistentId, winCmd, abilityCmd); @@ -1852,8 +1852,8 @@ void AbilityConnectManager::DoBackgroundAbilityWindow(const std::shared_ptrConvertAbilityState(abilityRecord->GetAbilityState()); - TAG_LOGD(AAFwkTag::ABILITYMGR, - "Background ability:%{public}s, persistentId:%{public}d, abilityState:%{public}s", + TAG_LOGI(AAFwkTag::ABILITYMGR, + "ability:%{public}s, persistentId:%{public}d, abilityState:%{public}s", abilityRecord->GetURI().c_str(), sessionInfo->persistentId, abilitystateStr.c_str()); if (abilityRecord->IsAbilityState(AbilityState::FOREGROUND)) { MoveToBackground(abilityRecord); @@ -1873,8 +1873,8 @@ void AbilityConnectManager::TerminateAbilityWindowLocked(const std::shared_ptrConvertAbilityState(abilityRecord->GetAbilityState()); - TAG_LOGD(AAFwkTag::ABILITYMGR, - "Terminate ability:%{public}s, persistentId:%{public}d, abilityState:%{public}s", + TAG_LOGI(AAFwkTag::ABILITYMGR, + "ability:%{public}s, persistentId:%{public}d, abilityState:%{public}s", abilityRecord->GetURI().c_str(), sessionInfo->persistentId, abilitystateStr.c_str()); EventInfo eventInfo; eventInfo.bundleName = abilityRecord->GetAbilityInfo().bundleName; @@ -2956,7 +2956,7 @@ void AbilityConnectManager::HandleProcessFrozen(const std::vector &pidL TAG_LOGE(AAFwkTag::ABILITYMGR, "taskHandler null"); return; } - TAG_LOGD(AAFwkTag::ABILITYMGR, "HandleProcessFrozen:%{public}d", uid); + TAG_LOGI(AAFwkTag::ABILITYMGR, "uid:%{public}d", uid); std::unordered_set pidSet(pidList.begin(), pidList.end()); std::lock_guard lock(serviceMapMutex_); auto weakThis = weak_from_this(); diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index a5e89317470..e024a9f00a6 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -3695,8 +3695,8 @@ int AbilityManagerService::ConnectAbilityCommon( AppExecFwk::ExtensionAbilityType extensionType, int32_t userId, bool isQueryExtensionOnly) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::ABILITYMGR, - "call, element uri:%{public}s.", want.GetElement().GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, + "elementUri:%{public}s", want.GetElement().GetURI().c_str()); CHECK_POINTER_AND_RETURN(connect, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(connect->AsObject(), ERR_INVALID_VALUE); if (extensionType == AppExecFwk::ExtensionAbilityType::SERVICE && IsCrossUserCall(userId)) { @@ -5589,7 +5589,7 @@ int AbilityManagerService::AbilityTransitionDone(const sptr &toke } auto abilityInfo = abilityRecord->GetAbilityInfo(); - TAG_LOGD(AAFwkTag::ABILITYMGR, "ability: %{public}s.", abilityRecord->GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "ability:%{public}s", abilityRecord->GetURI().c_str()); auto type = abilityInfo.type; auto userId = abilityRecord->GetApplicationInfo().uid / BASE_USER_RANGE; // force timeout ability for test @@ -5661,7 +5661,7 @@ int AbilityManagerService::AbilityWindowConfigTransitionDone( return CHECK_PERMISSION_FAILED; } - TAG_LOGD(AAFwkTag::ABILITYMGR, "ability:%{public}s", abilityRecord->GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "ability:%{public}s", abilityRecord->GetURI().c_str()); auto abilityInfo = abilityRecord->GetAbilityInfo(); auto type = abilityInfo.extensionAbilityType; if (type != AppExecFwk::ExtensionAbilityType::UI_SERVICE) { diff --git a/services/abilitymgr/src/ability_record.cpp b/services/abilitymgr/src/ability_record.cpp index f121bfdc503..6bf376d4133 100644 --- a/services/abilitymgr/src/ability_record.cpp +++ b/services/abilitymgr/src/ability_record.cpp @@ -400,7 +400,7 @@ void AbilityRecord::ForegroundAbility(uint32_t sceneFlag) void AbilityRecord::ForegroundAbility(const Closure &task, uint32_t sceneFlag) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::ABILITYMGR, "ability:%{public}s", GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "ability:%{public}s", GetURI().c_str()); CHECK_POINTER(lifecycleDeal_); // grant uri permission { @@ -1183,7 +1183,7 @@ void AbilityRecord::SetColdStartFlag(bool isColdStart) void AbilityRecord::BackgroundAbility(const Closure &task) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::ABILITYMGR, "ability:%{public}s.", GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "ability:%{public}s", GetURI().c_str()); if (lifecycleDeal_ == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Move the ability to background fail, lifecycleDeal_ is null."); return; diff --git a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp index 9afa5ec40d9..cdf5ef45a19 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -82,7 +82,7 @@ int UIAbilityLifecycleManager::StartUIAbility(AbilityRequest &abilityRequest, sp } abilityRequest.sessionInfo = sessionInfo; - TAG_LOGD(AAFwkTag::ABILITYMGR, "session id:%{public}d. bundle:%{public}s, ability:%{public}s", + TAG_LOGI(AAFwkTag::ABILITYMGR, "session:%{public}d. bundle:%{public}s, ability:%{public}s", sessionInfo->persistentId, abilityRequest.abilityInfo.bundleName.c_str(), abilityRequest.abilityInfo.name.c_str()); std::shared_ptr uiAbilityRecord = nullptr; diff --git a/services/abilitymgr/src/start_ability_utils.cpp b/services/abilitymgr/src/start_ability_utils.cpp index eb9cd576b87..45842ae2285 100644 --- a/services/abilitymgr/src/start_ability_utils.cpp +++ b/services/abilitymgr/src/start_ability_utils.cpp @@ -50,7 +50,7 @@ bool StartAbilityUtils::GetAppIndex(const Want &want, sptr caller appIndex = abilityRecord->GetAppIndex(); return true; } - TAG_LOGD(AAFwkTag::ABILITYMGR, "appCloneIndex:%{public}d", want.GetIntParam(Want::PARAM_APP_CLONE_INDEX_KEY, 0)); + TAG_LOGI(AAFwkTag::ABILITYMGR, "appCloneIndex:%{public}d", want.GetIntParam(Want::PARAM_APP_CLONE_INDEX_KEY, 0)); return AbilityRuntime::StartupUtil::GetAppIndex(want, appIndex); } -- Gitee From 43f9e49bbf67795a22740d2ea47f8877ed027081 Mon Sep 17 00:00:00 2001 From: chenxinzhan Date: Thu, 8 Aug 2024 14:56:11 +0800 Subject: [PATCH 4/8] log Signed-off-by: chenxinzhan --- frameworks/native/appkit/app/main_thread.cpp | 2 +- .../src/ability_connect_manager.cpp | 8 +++--- .../abilitymgr/src/ability_manager_client.cpp | 2 +- .../src/ability_manager_service.cpp | 28 +++++++++---------- services/abilitymgr/src/ability_record.cpp | 4 +-- .../abilitymgr/src/ability_scheduler_stub.cpp | 2 +- .../src/app_exit_reason_data_manager.cpp | 10 +++---- .../abilitymgr/src/app_exit_reason_helper.cpp | 4 +-- services/abilitymgr/src/app_scheduler.cpp | 4 +-- services/abilitymgr/src/call_container.cpp | 2 +- .../extension_control_interceptor.cpp | 2 +- .../src/preload_uiext_state_observer.cpp | 2 +- .../src/resident_process_manager.cpp | 2 +- services/abilitymgr/src/sender_info.cpp | 6 ++-- .../abilitymgr/src/sub_managers_helper.cpp | 2 +- services/appmgr/src/app_mgr_service.cpp | 2 +- 16 files changed, 41 insertions(+), 41 deletions(-) diff --git a/frameworks/native/appkit/app/main_thread.cpp b/frameworks/native/appkit/app/main_thread.cpp index 38e5997ea15..bf94a4f1197 100644 --- a/frameworks/native/appkit/app/main_thread.cpp +++ b/frameworks/native/appkit/app/main_thread.cpp @@ -3433,7 +3433,7 @@ void MainThread::ParseAppConfigurationParams(const std::string configuration, Co TAG_LOGD(AAFwkTag::APPKIT, "start"); appConfig.AddItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE, DEFAULT_APP_FONT_SIZE_SCALE); if (configuration.empty()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "empty configuration"); + TAG_LOGE(AAFwkTag::ABILITYMGR, "empty config"); return; } nlohmann::json configurationJson = nlohmann::json::parse(configuration, nullptr, false); diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index 92635d38946..bef48e3f8cd 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -785,7 +785,7 @@ int AbilityConnectManager::DisconnectRecordNormal(ConnectListType &list, { auto result = connectRecord->DisconnectAbility(); if (result != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Disconnect ability fail , ret = %{public}d.", result); + TAG_LOGE(AAFwkTag::ABILITYMGR, "fail:%{public}d.", result); return result; } @@ -1959,7 +1959,7 @@ void AbilityConnectManager::AddConnectDeathRecipient(sptr connect std::lock_guard guard(recipientMapMutex_); auto it = recipientMap_.find(connectObject); if (it != recipientMap_.end()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "This death recipient has been added."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "recipient added before"); return; } } @@ -1973,7 +1973,7 @@ void AbilityConnectManager::AddConnectDeathRecipient(sptr connect } }); if (!connectObject->AddDeathRecipient(deathRecipient)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed"); + TAG_LOGE(AAFwkTag::ABILITYMGR, "failed"); return; } std::lock_guard guard(recipientMapMutex_); @@ -2830,7 +2830,7 @@ void AbilityConnectManager::AddUIExtWindowDeathRecipient(const sptr thisWeakPtr(shared_from_this()); diff --git a/services/abilitymgr/src/ability_manager_client.cpp b/services/abilitymgr/src/ability_manager_client.cpp index 27c11dc62c1..d588b578d7c 100644 --- a/services/abilitymgr/src/ability_manager_client.cpp +++ b/services/abilitymgr/src/ability_manager_client.cpp @@ -493,7 +493,7 @@ ErrCode AbilityManagerClient::ConnectAbility( HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); auto abms = GetAbilityManager(); CHECK_POINTER_RETURN_NOT_CONNECTED(abms); - TAG_LOGI(AAFwkTag::ABILITYMGR, "name:%{public}s %{public}s, userId:%{public}d.", + TAG_LOGI(AAFwkTag::ABILITYMGR, "name:%{public}s %{public}s, userId:%{public}d", want.GetElement().GetBundleName().c_str(), want.GetElement().GetAbilityName().c_str(), userId); return abms->ConnectAbilityCommon(want, connect, callerToken, AppExecFwk::ExtensionAbilityType::SERVICE, userId); } diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index e024a9f00a6..716e1418941 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -753,7 +753,7 @@ int AbilityManagerService::StartAbilityPublicPrechainCheck(StartAbilityParams &p // 2. validUserId, multi-user if (!JudgeMultiUserConcurrency(params.GetValidUserId())) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); return ERR_CROSS_USER; } @@ -1006,7 +1006,7 @@ int AbilityManagerService::StartAbilityInner(const Want &want, const sptr &exte } else if (extensionSessionInfo->want.GetStringParam(UIEXTENSION_TYPE_KEY) == AUTO_FILL_SMART_TPYE) { SplitStr(KEY_SMART_AUTO_FILL_ABILITY, "/", argList); } else { - TAG_LOGW(AAFwkTag::ABILITYMGR, "It is not autofill type."); + TAG_LOGW(AAFwkTag::ABILITYMGR, "not autofill"); return; } @@ -2963,7 +2963,7 @@ int AbilityManagerService::StartUIExtensionAbility(const sptr &exte int32_t validUserId = GetValidUserId(userId); if (!JudgeMultiUserConcurrency(validUserId)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); eventInfo.errCode = ERR_INVALID_VALUE; EventReport::SendExtensionEvent(EventName::START_EXTENSION_ERROR, HiSysEventType::FAULT, eventInfo); return ERR_INVALID_VALUE; @@ -3053,7 +3053,7 @@ int AbilityManagerService::StopExtensionAbility(const Want &want, const sptr(want)); bool isEnterpriseAdmin = AAFwk::UIExtensionUtils::IsEnterpriseAdmin(extensionType); if (!isEnterpriseAdmin && !JudgeMultiUserConcurrency(userId)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); return ERR_CROSS_USER; } @@ -3942,7 +3942,7 @@ int AbilityManagerService::ConnectLocalAbility(const Want &want, const int32_t u TAG_LOGD(AAFwkTag::ABILITYMGR, "requestWant SetParam success"); if (result != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate ability request error."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate request error"); return result; } if (!UriUtils::GetInstance().CheckNonImplicitShareFileUri(abilityRequest)) { @@ -6095,7 +6095,7 @@ int AbilityManagerService::StopServiceAbility(const Want &want, int32_t userId, int32_t validUserId = GetValidUserId(userId); if (!JudgeMultiUserConcurrency(validUserId)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied"); return ERR_CROSS_USER; } @@ -7003,7 +7003,7 @@ int AbilityManagerService::StartAbilityByCall(const Want &want, const sptr &remote) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "recv AbilitySchedulerRecipient death notice"); + TAG_LOGE(AAFwkTag::ABILITYMGR, "call"); if (handler_) { handler_(remote); diff --git a/services/abilitymgr/src/app_exit_reason_data_manager.cpp b/services/abilitymgr/src/app_exit_reason_data_manager.cpp index 25235023a39..cde8248b70a 100644 --- a/services/abilitymgr/src/app_exit_reason_data_manager.cpp +++ b/services/abilitymgr/src/app_exit_reason_data_manager.cpp @@ -386,7 +386,7 @@ int32_t AppExitReasonDataManager::DeleteAllRecoverInfoByTokenId(uint32_t tokenId int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo( uint32_t accessTokenId, const std::string &moduleName, const std::string &abilityName) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "DeleteAbilityRecoverInfo tokenId %{private}u module %{public}s ability %{public}s ", + TAG_LOGI(AAFwkTag::ABILITYMGR, "tokenId %{private}u module %{public}s ability %{public}s ", accessTokenId, moduleName.c_str(), abilityName.c_str()); { std::lock_guard lock(kvStorePtrMutex_); @@ -400,7 +400,7 @@ int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo( DistributedKv::Value value; DistributedKv::Status status = kvStorePtr_->Get(key, value); if (status != DistributedKv::Status::SUCCESS) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "DeleteAbilityRecoverInfo get error: %{public}d", status); + TAG_LOGE(AAFwkTag::ABILITYMGR, "failed:%{public}d", status); return ERR_INVALID_VALUE; } @@ -429,7 +429,7 @@ int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo( int32_t AppExitReasonDataManager::GetAbilityRecoverInfo( uint32_t accessTokenId, const std::string &moduleName, const std::string &abilityName, bool &hasRecoverInfo) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo tokenId %{private}u module %{public}s abillity %{public}s ", + TAG_LOGI(AAFwkTag::ABILITYMGR, "tokenId %{private}u module %{public}s abillity %{public}s", accessTokenId, moduleName.c_str(), abilityName.c_str()); hasRecoverInfo = false; { @@ -445,9 +445,9 @@ int32_t AppExitReasonDataManager::GetAbilityRecoverInfo( DistributedKv::Status status = kvStorePtr_->Get(key, value); if (status != DistributedKv::Status::SUCCESS) { if (status == DistributedKv::Status::KEY_NOT_FOUND) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo KEY_NOT_FOUND."); + TAG_LOGW(AAFwkTag::ABILITYMGR, "KEY_NOT_FOUND"); } else { - TAG_LOGE(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo error: %{public}d.", status); + TAG_LOGE(AAFwkTag::ABILITYMGR, "error:%{public}d", status); } return ERR_INVALID_VALUE; } diff --git a/services/abilitymgr/src/app_exit_reason_helper.cpp b/services/abilitymgr/src/app_exit_reason_helper.cpp index e3aaa48682c..64caba07381 100644 --- a/services/abilitymgr/src/app_exit_reason_helper.cpp +++ b/services/abilitymgr/src/app_exit_reason_helper.cpp @@ -68,7 +68,7 @@ int32_t AppExitReasonHelper::RecordAppExitReason(const ExitReason &exitReason) } if (abilityList.empty()) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Active abilityLists empty."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "abilityLists empty"); return ERR_GET_ACTIVE_ABILITY_LIST_EMPTY; } int32_t userId; @@ -138,7 +138,7 @@ int32_t AppExitReasonHelper::RecordProcessExitReason(const int32_t pid, const st auto ret = DelayedSingleton::GetInstance()->NotifyAppMgrRecordExitReason(pid, exitReason.reason, exitReason.exitMsg); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed.code: %{public}d", ret); + TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed:%{public}d", ret); } if (abilityLists.empty()) { diff --git a/services/abilitymgr/src/app_scheduler.cpp b/services/abilitymgr/src/app_scheduler.cpp index 609b181cf84..cb7e9e044cb 100644 --- a/services/abilitymgr/src/app_scheduler.cpp +++ b/services/abilitymgr/src/app_scheduler.cpp @@ -479,13 +479,13 @@ int AppScheduler::GetApplicationInfoByProcessID(const int pid, AppExecFwk::Appli int32_t AppScheduler::NotifyAppMgrRecordExitReason(int32_t pid, int32_t reason, const std::string &exitMsg) { if (pid < 0) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed, pid <= 0."); + TAG_LOGW(AAFwkTag::ABILITYMGR, "pid<=0"); return ERR_INVALID_VALUE; } CHECK_POINTER_AND_RETURN(appMgrClient_, INNER_ERR); auto ret = static_cast(IN_PROCESS_CALL(appMgrClient_->NotifyAppMgrRecordExitReason(pid, reason, exitMsg))); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "failed"); return ret; } return ERR_OK; diff --git a/services/abilitymgr/src/call_container.cpp b/services/abilitymgr/src/call_container.cpp index e0c9f835f3b..ca1f10b5ef6 100644 --- a/services/abilitymgr/src/call_container.cpp +++ b/services/abilitymgr/src/call_container.cpp @@ -135,7 +135,7 @@ bool CallContainer::CallRequestDone(const sptr &callStub) } }); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call Request Done end."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "end"); return true; } diff --git a/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp b/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp index 1f002e1652e..d871867a7e0 100644 --- a/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/extension_control_interceptor.cpp @@ -60,7 +60,7 @@ ErrCode ExtensionControlInterceptor::DoProcess(AbilityInterceptorParam param) return EXTENSION_BLOCKED_BY_SERVICE_LIST; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "other ok."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "other ok"); return ERR_OK; } diff --git a/services/abilitymgr/src/preload_uiext_state_observer.cpp b/services/abilitymgr/src/preload_uiext_state_observer.cpp index 81dc573cf6e..4205393c7dc 100644 --- a/services/abilitymgr/src/preload_uiext_state_observer.cpp +++ b/services/abilitymgr/src/preload_uiext_state_observer.cpp @@ -26,7 +26,7 @@ PreLoadUIExtStateObserver::PreLoadUIExtStateObserver( void PreLoadUIExtStateObserver::OnProcessDied(const AppExecFwk::ProcessData &processData) { auto diedProcessName = processData.processName; - TAG_LOGI(AAFwkTag::ABILITYMGR, "DiedProcessName is %{public}s.", diedProcessName.c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "process:%{public}s", diedProcessName.c_str()); auto extensionRecord = extensionRecord_.lock(); if (extensionRecord != nullptr) { auto hostPid = extensionRecord->hostPid_; diff --git a/services/abilitymgr/src/resident_process_manager.cpp b/services/abilitymgr/src/resident_process_manager.cpp index 932ae3fe601..4ba3949b9df 100644 --- a/services/abilitymgr/src/resident_process_manager.cpp +++ b/services/abilitymgr/src/resident_process_manager.cpp @@ -249,7 +249,7 @@ void ResidentProcessManager::OnAppStateChanged(const AppInfo &info) bool localEnable = false; auto rdbResult = AmsResidentProcessRdb::GetInstance().GetResidentProcessEnable(bundleName, localEnable); if (rdbResult != Rdb_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to obtain resident process properties. result: %{public}d", rdbResult); + TAG_LOGE(AAFwkTag::ABILITYMGR, "GetResidentProcessEnable failed: %{public}d", rdbResult); return; } diff --git a/services/abilitymgr/src/sender_info.cpp b/services/abilitymgr/src/sender_info.cpp index 6e5c87c45a3..7f75db03a5d 100644 --- a/services/abilitymgr/src/sender_info.cpp +++ b/services/abilitymgr/src/sender_info.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace AAFwk { bool SenderInfo::ReadFromParcel(Parcel &parcel) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); code = parcel.ReadInt32(); std::unique_ptr wantResquest(parcel.ReadParcelable()); @@ -53,7 +53,7 @@ bool SenderInfo::ReadFromParcel(Parcel &parcel) SenderInfo *SenderInfo::Unmarshalling(Parcel &parcel) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); SenderInfo *info = new (std::nothrow) SenderInfo(); if (info == nullptr) { @@ -71,7 +71,7 @@ SenderInfo *SenderInfo::Unmarshalling(Parcel &parcel) bool SenderInfo::Marshalling(Parcel &parcel) const { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); if (!parcel.WriteInt32(code)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to write code"); diff --git a/services/abilitymgr/src/sub_managers_helper.cpp b/services/abilitymgr/src/sub_managers_helper.cpp index 0400e6d3b96..57d131461b0 100644 --- a/services/abilitymgr/src/sub_managers_helper.cpp +++ b/services/abilitymgr/src/sub_managers_helper.cpp @@ -445,7 +445,7 @@ bool SubManagersHelper::VerificationAllToken(const sptr &token) return true; } } - TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to verify all token."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "fail"); return false; } diff --git a/services/appmgr/src/app_mgr_service.cpp b/services/appmgr/src/app_mgr_service.cpp index 4c0eeb179d3..7962c30c050 100644 --- a/services/appmgr/src/app_mgr_service.cpp +++ b/services/appmgr/src/app_mgr_service.cpp @@ -1084,7 +1084,7 @@ int32_t AppMgrService::NotifyHotReloadPage(const std::string &bundleName, const int32_t AppMgrService::SetContinuousTaskProcess(int32_t pid, bool isContinuousTask) { if (!AAFwk::PermissionVerification::GetInstance()->CheckSpecificSystemAbilityAccessPermission(FOUNDATION_PROCESS)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "caller is not foundation."); + TAG_LOGE(AAFwkTag::ABILITYMGR, "caller not foundation"); return ERR_INVALID_OPERATION; } if (!IsReady()) { -- Gitee From 472b9cf6a4054bc82cab521a55e736f579e49473 Mon Sep 17 00:00:00 2001 From: chenxinzhan Date: Thu, 8 Aug 2024 14:57:22 +0800 Subject: [PATCH 5/8] log to debug Signed-off-by: chenxinzhan --- .../abilitymgr/src/ability_connect_manager.cpp | 12 ++++++------ .../abilitymgr/src/ability_manager_client.cpp | 2 +- .../abilitymgr/src/ability_manager_service.cpp | 8 ++++---- services/abilitymgr/src/ability_record.cpp | 4 ++-- .../abilitymgr/src/ability_scheduler_proxy.cpp | 4 ++-- services/abilitymgr/src/app_scheduler.cpp | 2 +- services/abilitymgr/src/call_container.cpp | 2 +- .../scene_board/ui_ability_lifecycle_manager.cpp | 16 ++++++++-------- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index bef48e3f8cd..2b66dd4c640 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -187,11 +187,11 @@ int AbilityConnectManager::TerminateAbilityInner(const sptr &toke TAG_LOGD(AAFwkTag::ABILITYMGR, "Terminate ability, ability is %{public}s.", element.c_str()); if (IsUIExtensionAbility(abilityRecord)) { if (!abilityRecord->IsConnectListEmpty()) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "There exist connection, don't terminate."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "exist connection, don't terminate"); return ERR_OK; } else if (abilityRecord->IsAbilityState(AbilityState::FOREGROUND) || abilityRecord->IsAbilityState(AbilityState::FOREGROUNDING)) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "current ability is active"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "current ability is active"); DoBackgroundAbilityWindow(abilityRecord, abilityRecord->GetSessionInfo()); MoveToTerminatingMap(abilityRecord); return ERR_OK; @@ -203,7 +203,7 @@ int AbilityConnectManager::TerminateAbilityInner(const sptr &toke int AbilityConnectManager::StopServiceAbility(const AbilityRequest &abilityRequest) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); std::lock_guard guard(serialMutex_); return StopServiceAbilityLocked(abilityRequest); } @@ -627,7 +627,7 @@ int AbilityConnectManager::ConnectAbilityLocked(const AbilityRequest &abilityReq bool isCallbackConnected = !connectRecordList.empty(); // 3. If this service ability and callback has been connected, There is no need to connect repeatedly if (isLoadedAbility && (isCallbackConnected) && IsAbilityConnected(targetService, connectRecordList)) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "Service and callback was connected."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Service/callback connected"); return ERR_OK; } @@ -664,7 +664,7 @@ int AbilityConnectManager::ConnectAbilityLocked(const AbilityRequest &abilityReq targetService->SetWant(abilityRequest.want); HandleActiveAbility(targetService, connectRecord); } else { - TAG_LOGI(AAFwkTag::ABILITYMGR, "Target service is activating, wait for callback"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "TargetService active"); targetService->SaveConnectWant(abilityRequest.want); } @@ -2909,7 +2909,7 @@ bool AbilityConnectManager::IsUIExtensionFocused(uint32_t uiExtensionTokenId, co auto sessionInfo = item.second.second; if (uiExtension && uiExtension->GetApplicationInfo().accessTokenId == uiExtensionTokenId) { if (uiExtensionAbilityRecordMgr_->IsFocused(uiExtension->GetUIExtensionAbilityId(), focusToken)) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "isFocused."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Focused"); return true; } if (sessionInfo && sessionInfo->callerToken == focusToken) { diff --git a/services/abilitymgr/src/ability_manager_client.cpp b/services/abilitymgr/src/ability_manager_client.cpp index d588b578d7c..15dde69ac73 100644 --- a/services/abilitymgr/src/ability_manager_client.cpp +++ b/services/abilitymgr/src/ability_manager_client.cpp @@ -482,7 +482,7 @@ ErrCode AbilityManagerClient::ConnectAbility(const Want &want, sptrConnectAbilityCommon(want, connect, nullptr, AppExecFwk::ExtensionAbilityType::SERVICE, userId); } diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 716e1418941..987b5481d45 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -3041,7 +3041,7 @@ int AbilityManagerService::StartUIExtensionAbility(const sptr &exte return ERR_INVALID_VALUE; } ReportEventToRSS(abilityRequest.abilityInfo, abilityRequest.callerToken); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Start extension begin, name is %{public}s.", abilityInfo.name.c_str()); + TAG_LOGD(AAFwkTag::ABILITYMGR, "name:%{public}s", abilityInfo.name.c_str()); eventInfo.errCode = connectManager->StartAbility(abilityRequest); if (eventInfo.errCode != ERR_OK) { EventReport::SendExtensionEvent(EventName::START_EXTENSION_ERROR, HiSysEventType::FAULT, eventInfo); @@ -3125,7 +3125,7 @@ int AbilityManagerService::StopExtensionAbility(const Want &want, const sptrStopServiceAbility(abilityRequest); if (eventInfo.errCode != ERR_OK) { EventReport::SendExtensionEvent(EventName::STOP_EXTENSION_ERROR, HiSysEventType::FAULT, eventInfo); @@ -6962,7 +6962,7 @@ int AbilityManagerService::ReleaseRemoteAbility(const sptr &conne int AbilityManagerService::StartAbilityByCall(const Want &want, const sptr &connect, const sptr &callerToken, int32_t accountId) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "call ability."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); CHECK_POINTER_AND_RETURN(connect, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(connect->AsObject(), ERR_INVALID_VALUE); if (IsCrossUserCall(accountId)) { @@ -9379,7 +9379,7 @@ int AbilityManagerService::CheckCallAbilityPermission(const AbilityRequest &abil int AbilityManagerService::CheckStartByCallPermission(const AbilityRequest &abilityRequest) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Call"); // check whether the target ability is page type and not specified mode. if (abilityRequest.abilityInfo.type != AppExecFwk::AbilityType::PAGE || abilityRequest.abilityInfo.launchMode == AppExecFwk::LaunchMode::SPECIFIED) { diff --git a/services/abilitymgr/src/ability_record.cpp b/services/abilitymgr/src/ability_record.cpp index 71bb9dbf853..62b1e89974b 100644 --- a/services/abilitymgr/src/ability_record.cpp +++ b/services/abilitymgr/src/ability_record.cpp @@ -1239,7 +1239,7 @@ int AbilityRecord::TerminateAbility() eventInfo.bundleName = GetAbilityInfo().bundleName; eventInfo.abilityName = GetAbilityInfo().name; if (clearMissionFlag_) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "deleteAbilityRecoverInfo before clearMission."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "deleteAbilityRecoverInfo before clearMission"); (void)DelayedSingleton::GetInstance()-> DeleteAbilityRecoverInfo(GetAbilityInfo().applicationInfo.accessTokenId, GetAbilityInfo().moduleName, GetAbilityInfo().name); @@ -1853,7 +1853,7 @@ void AbilityRecord::SaveResultToCallers(const int resultCode, const Want *result continue; } if (caller == latestCaller) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "Caller record is the latest."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "latestCaller"); SaveResult(resultCode, resultWant, caller); continue; } diff --git a/services/abilitymgr/src/ability_scheduler_proxy.cpp b/services/abilitymgr/src/ability_scheduler_proxy.cpp index ed91f256072..5f785dee070 100644 --- a/services/abilitymgr/src/ability_scheduler_proxy.cpp +++ b/services/abilitymgr/src/ability_scheduler_proxy.cpp @@ -1091,7 +1091,7 @@ void AbilitySchedulerProxy::DumpAbilityInfo(const std::vector ¶ void AbilitySchedulerProxy::CallRequest() { - TAG_LOGI(AAFwkTag::ABILITYMGR, "AbilitySchedulerProxy::CallRequest start"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "start"); MessageParcel data; MessageParcel reply; @@ -1107,7 +1107,7 @@ void AbilitySchedulerProxy::CallRequest() return; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "AbilitySchedulerProxy::CallRequest end"); + TAG_LOGD(AAFwkTag::ABILITYMGR, "end"); } void AbilitySchedulerProxy::OnExecuteIntent(const Want &want) diff --git a/services/abilitymgr/src/app_scheduler.cpp b/services/abilitymgr/src/app_scheduler.cpp index cb7e9e044cb..f31d66e9260 100644 --- a/services/abilitymgr/src/app_scheduler.cpp +++ b/services/abilitymgr/src/app_scheduler.cpp @@ -242,7 +242,7 @@ void AppScheduler::OnAppRemoteDied(const std::vector> &abili int AppScheduler::KillApplication(const std::string &bundleName, const bool clearPageStack) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "[%{public}s(%{public}s)] enter", __FILE__, __FUNCTION__); + TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); CHECK_POINTER_AND_RETURN(appMgrClient_, INNER_ERR); int ret = (int)appMgrClient_->KillApplication(bundleName, clearPageStack); if (ret != ERR_OK) { diff --git a/services/abilitymgr/src/call_container.cpp b/services/abilitymgr/src/call_container.cpp index ca1f10b5ef6..38ffc28caf5 100644 --- a/services/abilitymgr/src/call_container.cpp +++ b/services/abilitymgr/src/call_container.cpp @@ -121,7 +121,7 @@ void CallContainer::OnConnectionDied(const wptr &remote) bool CallContainer::CallRequestDone(const sptr &callStub) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call Request Done start."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "start"); CHECK_POINTER_AND_RETURN(callStub, false); diff --git a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp index cdf5ef45a19..d869bd63d42 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -88,7 +88,7 @@ int UIAbilityLifecycleManager::StartUIAbility(AbilityRequest &abilityRequest, sp std::shared_ptr uiAbilityRecord = nullptr; auto iter = sessionAbilityMap_.find(sessionInfo->persistentId); if (iter != sessionAbilityMap_.end()) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "isNewWant: %{public}d.", sessionInfo->isNewWant); + TAG_LOGD(AAFwkTag::ABILITYMGR, "NewWant:%{public}d", sessionInfo->isNewWant); uiAbilityRecord = iter->second; uiAbilityRecord->SetIsNewWant(sessionInfo->isNewWant); if (sessionInfo->isNewWant) { @@ -754,7 +754,7 @@ int UIAbilityLifecycleManager::MinimizeUIAbility(const std::shared_ptrGetAbilityInfo().name.c_str()); + TAG_LOGD(AAFwkTag::ABILITYMGR, "infoName:%{public}s", abilityRecord->GetAbilityInfo().name.c_str()); abilityRecord->SetMinimizeReason(fromUser); abilityRecord->SetSceneFlag(sceneFlag); if (abilityRecord->GetPendingState() != AbilityState::INITIAL) { @@ -955,7 +955,7 @@ int UIAbilityLifecycleManager::NotifySCBPendingActivation(sptr &ses (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_HEIGHT, 0), (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_WIDTH, 0), (sessionInfo->want).GetIntParam(Want::PARAM_RESV_WINDOW_MODE, 0)); - TAG_LOGI(AAFwkTag::ABILITYMGR, "appCloneIndex: %{public}d.", + TAG_LOGI(AAFwkTag::ABILITYMGR, "appCloneIndex:%{public}d", (sessionInfo->want).GetIntParam(Want::PARAM_APP_CLONE_INDEX_KEY, 0)); auto abilityRecord = GetAbilityRecordByToken(abilityRequest.callerToken); if (abilityRecord != nullptr && !abilityRecord->GetRestartAppFlag()) { @@ -964,7 +964,7 @@ int UIAbilityLifecycleManager::NotifySCBPendingActivation(sptr &ses CHECK_POINTER_AND_RETURN(callerSessionInfo->sessionToken, ERR_INVALID_VALUE); auto callerSession = iface_cast(callerSessionInfo->sessionToken); CheckCallerFromBackground(abilityRecord, sessionInfo); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by callerSession."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by callerSession."); return static_cast(callerSession->PendingSessionActivation(sessionInfo)); } auto tmpSceneSession = iface_cast(rootSceneSession_); @@ -976,11 +976,11 @@ int UIAbilityLifecycleManager::NotifySCBPendingActivation(sptr &ses (void)DelayedSingleton::GetInstance()->GetAbilitySessionId( abilityInfo.applicationInfo.accessTokenId, abilityInfo.moduleName, abilityInfo.name, sessionInfo->persistentId); - TAG_LOGI(AAFwkTag::ABILITYMGR, "session id: %{public}d.", sessionInfo->persistentId); + TAG_LOGD(AAFwkTag::ABILITYMGR, "session id:%{public}d", sessionInfo->persistentId); } } sessionInfo->canStartAbilityFromBackground = true; - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by rootSceneSession."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by rootSceneSession."); return static_cast(tmpSceneSession->PendingSessionActivation(sessionInfo)); } @@ -1990,7 +1990,7 @@ void UIAbilityLifecycleManager::GetActiveAbilityList(int32_t uid, std::vector guard(sessionLock_); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Call"); for (const auto& [sessionId, abilityRecord] : sessionAbilityMap_) { if (abilityRecord == nullptr) { TAG_LOGW(AAFwkTag::ABILITYMGR, "second is nullptr."); @@ -2108,7 +2108,7 @@ void UIAbilityLifecycleManager::UninstallApp(const std::string &bundleName, int3 { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); std::lock_guard guard(sessionLock_); - TAG_LOGI(AAFwkTag::ABILITYMGR, "Call."); + TAG_LOGD(AAFwkTag::ABILITYMGR, "Call"); for (auto it = sessionAbilityMap_.begin(); it != sessionAbilityMap_.end();) { if (it->second == nullptr) { it++; -- Gitee From a8c075c9f9e8f09742ec16aef6998745f9847e51 Mon Sep 17 00:00:00 2001 From: chenxinzhan Date: Thu, 8 Aug 2024 19:25:14 +0800 Subject: [PATCH 6/8] reserve lifecycle Signed-off-by: chenxinzhan --- services/abilitymgr/src/ability_manager_service.cpp | 4 ++-- services/abilitymgr/src/ability_record.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 987b5481d45..74bcdc1cccc 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -5589,7 +5589,7 @@ int AbilityManagerService::AbilityTransitionDone(const sptr &toke } auto abilityInfo = abilityRecord->GetAbilityInfo(); - TAG_LOGI(AAFwkTag::ABILITYMGR, "ability:%{public}s", abilityRecord->GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "Lifecycle: ability:%{public}s", abilityRecord->GetURI().c_str()); auto type = abilityInfo.type; auto userId = abilityRecord->GetApplicationInfo().uid / BASE_USER_RANGE; // force timeout ability for test @@ -5661,7 +5661,7 @@ int AbilityManagerService::AbilityWindowConfigTransitionDone( return CHECK_PERMISSION_FAILED; } - TAG_LOGI(AAFwkTag::ABILITYMGR, "ability:%{public}s", abilityRecord->GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "Lifecycle: ability:%{public}s", abilityRecord->GetURI().c_str()); auto abilityInfo = abilityRecord->GetAbilityInfo(); auto type = abilityInfo.extensionAbilityType; if (type != AppExecFwk::ExtensionAbilityType::UI_SERVICE) { diff --git a/services/abilitymgr/src/ability_record.cpp b/services/abilitymgr/src/ability_record.cpp index 62b1e89974b..1f36fa49c57 100644 --- a/services/abilitymgr/src/ability_record.cpp +++ b/services/abilitymgr/src/ability_record.cpp @@ -370,7 +370,7 @@ void AbilityRecord::ForegroundAbility(uint32_t sceneFlag) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); isWindowStarted_ = true; - TAG_LOGI(AAFwkTag::ABILITYMGR, "name:%{public}s", abilityInfo_.name.c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "ForegroundLifecycle: name:%{public}s", abilityInfo_.name.c_str()); CHECK_POINTER(lifecycleDeal_); // schedule active after updating AbilityState and sending timeout message to avoid ability async callback @@ -1183,7 +1183,7 @@ void AbilityRecord::SetColdStartFlag(bool isColdStart) void AbilityRecord::BackgroundAbility(const Closure &task) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::ABILITYMGR, "ability:%{public}s", GetURI().c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "BackgroundLifecycle: ability:%{public}s", GetURI().c_str()); if (lifecycleDeal_ == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Move the ability to background fail, lifecycleDeal_ is null."); return; -- Gitee From a1eef012809516d19353964f054ac879dc29f9b6 Mon Sep 17 00:00:00 2001 From: chenxinzhan Date: Fri, 9 Aug 2024 18:21:38 +0800 Subject: [PATCH 7/8] handle issue Signed-off-by: chenxinzhan --- services/abilitymgr/src/ability_connect_manager.cpp | 2 +- services/abilitymgr/src/ability_record.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index 2b66dd4c640..1f24fbd0bc2 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -1973,7 +1973,7 @@ void AbilityConnectManager::AddConnectDeathRecipient(sptr connect } }); if (!connectObject->AddDeathRecipient(deathRecipient)) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed"); + TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed"); return; } std::lock_guard guard(recipientMapMutex_); diff --git a/services/abilitymgr/src/ability_record.cpp b/services/abilitymgr/src/ability_record.cpp index 1f36fa49c57..86c5c2a90df 100644 --- a/services/abilitymgr/src/ability_record.cpp +++ b/services/abilitymgr/src/ability_record.cpp @@ -1843,7 +1843,7 @@ void AbilityRecord::SaveResultToCallers(const int resultCode, const Want *result { auto callerRecordList = GetCallerRecordList(); if (callerRecordList.empty()) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "callerList empty"); + TAG_LOGW(AAFwkTag::ABILITYMGR, "callerRecordList is empty"); return; } auto latestCaller = callerRecordList.back(); -- Gitee From 20df43ffb285c228a6a552093fa4cb423e45442f Mon Sep 17 00:00:00 2001 From: chenxinzhan Date: Tue, 13 Aug 2024 10:55:08 +0800 Subject: [PATCH 8/8] handle issue Signed-off-by: chenxinzhan --- services/abilitymgr/src/ability_connect_manager.cpp | 4 ++-- .../src/scene_board/ui_ability_lifecycle_manager.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index 1f24fbd0bc2..a193b8895d7 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -203,7 +203,7 @@ int AbilityConnectManager::TerminateAbilityInner(const sptr &toke int AbilityConnectManager::StopServiceAbility(const AbilityRequest &abilityRequest) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); std::lock_guard guard(serialMutex_); return StopServiceAbilityLocked(abilityRequest); } @@ -766,7 +766,7 @@ int AbilityConnectManager::DisconnectAbilityLocked(const sptr abilityRecord) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); + TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); if (!GetAbilityRecordById(abilityRecord->GetRecordId()) && !AbilityCacheManager::GetInstance().FindRecordByToken(abilityRecord->GetToken())) { return; diff --git a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp index d869bd63d42..7ceb773393c 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -88,7 +88,7 @@ int UIAbilityLifecycleManager::StartUIAbility(AbilityRequest &abilityRequest, sp std::shared_ptr uiAbilityRecord = nullptr; auto iter = sessionAbilityMap_.find(sessionInfo->persistentId); if (iter != sessionAbilityMap_.end()) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "NewWant:%{public}d", sessionInfo->isNewWant); + TAG_LOGI(AAFwkTag::ABILITYMGR, "NewWant:%{public}d", sessionInfo->isNewWant); uiAbilityRecord = iter->second; uiAbilityRecord->SetIsNewWant(sessionInfo->isNewWant); if (sessionInfo->isNewWant) { @@ -754,7 +754,7 @@ int UIAbilityLifecycleManager::MinimizeUIAbility(const std::shared_ptrGetAbilityInfo().name.c_str()); + TAG_LOGI(AAFwkTag::ABILITYMGR, "infoName:%{public}s", abilityRecord->GetAbilityInfo().name.c_str()); abilityRecord->SetMinimizeReason(fromUser); abilityRecord->SetSceneFlag(sceneFlag); if (abilityRecord->GetPendingState() != AbilityState::INITIAL) { @@ -980,7 +980,7 @@ int UIAbilityLifecycleManager::NotifySCBPendingActivation(sptr &ses } } sessionInfo->canStartAbilityFromBackground = true; - TAG_LOGD(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by rootSceneSession."); + TAG_LOGI(AAFwkTag::ABILITYMGR, "Call PendingSessionActivation by rootSceneSession"); return static_cast(tmpSceneSession->PendingSessionActivation(sessionInfo)); } -- Gitee