From 2eecd9dc7174ce2966a51d2f42732465ec32cb7d Mon Sep 17 00:00:00 2001 From: chen Date: Tue, 12 Apr 2022 21:15:16 +0800 Subject: [PATCH] add hilog for subscribe sa Signed-off-by: chen Change-Id: Ic636f2e734e60f2ce0f03e9cb2f9e8e92e008f2d --- .../system_ability_status_change_stub.cpp | 2 ++ .../native/source/system_ability_manager.cpp | 25 ++++++++++--------- .../system_ability_status_change_proxy.cpp | 1 + 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/frameworks/native/source/system_ability_status_change_stub.cpp b/frameworks/native/source/system_ability_status_change_stub.cpp index 1b579ce0..5caad06e 100644 --- a/frameworks/native/source/system_ability_status_change_stub.cpp +++ b/frameworks/native/source/system_ability_status_change_stub.cpp @@ -49,11 +49,13 @@ int32_t SystemAbilityStatusChangeStub::OnRemoteRequest(uint32_t code, int32_t SystemAbilityStatusChangeStub::OnAddSystemAbilityInner(MessageParcel& data, MessageParcel& reply) { + HILOGI("SystemAbilityStatusChangeStub::OnAddSystemAbilityInner enter"); int32_t systemAbilityId = data.ReadInt32(); if (!CheckInputSysAbilityId(systemAbilityId)) { HILOGW("read systemAbilityId failed!"); return ERR_NULL_OBJECT; } + HILOGI("SystemAbilityStatusChangeStub::OnAddSystemAbilityInner OnAddSystemAbility sa : %{public}d", systemAbilityId); std::string deviceId = data.ReadString(); OnAddSystemAbility(systemAbilityId, deviceId); return ERR_NONE; diff --git a/services/samgr/native/source/system_ability_manager.cpp b/services/samgr/native/source/system_ability_manager.cpp index 6d68ab3f..23f46868 100644 --- a/services/samgr/native/source/system_ability_manager.cpp +++ b/services/samgr/native/source/system_ability_manager.cpp @@ -196,7 +196,7 @@ sptr SystemAbilityManager::CheckSystemAbility(int32_t systemAbili if (dBinderService_ != nullptr) { string strName = to_string(systemAbilityId); remoteBinder = dBinderService_->MakeRemoteBinder(Str8ToStr16(strName), deviceId, systemAbilityId, 0); - HILOGI("CheckSystemAbility, MakeRemoteBinder, systemAbilityId is %{public}d, deviceId is %s", + HILOGI("CheckSystemAbility, MakeRemoteBinder, systemAbilityId is %{public}d, deviceId is %{public}s", systemAbilityId, deviceId.c_str()); if (remoteBinder == nullptr) { HILOGE("MakeRemoteBinder error, remoteBinder is null"); @@ -213,8 +213,9 @@ int32_t SystemAbilityManager::FindSystemAbilityNotify(int32_t systemAbilityId, i void SystemAbilityManager::NotifySystemAbilityChanged(int32_t systemAbilityId, const std::string& deviceId, int32_t code, const sptr& listener) { + HILOGI("%{public}s called:systemAbilityId = %{public}d, code = %{public}d", __func__, systemAbilityId, code); if (listener == nullptr) { - HILOGE("%s listener null pointer!", __func__); + HILOGE("%{public}s listener null pointer!", __func__); return; } @@ -235,7 +236,7 @@ void SystemAbilityManager::NotifySystemAbilityChanged(int32_t systemAbilityId, c int32_t SystemAbilityManager::FindSystemAbilityNotify(int32_t systemAbilityId, const std::string& deviceId, int32_t code) { - HILOGI("%s called:systemAbilityId = %{public}d, code = %{public}d", __func__, systemAbilityId, code); + HILOGI("%{public}s called:systemAbilityId = %{public}d, code = %{public}d", __func__, systemAbilityId, code); lock_guard autoLock(listenerMapLock_); auto iter = listenerMap_.find(systemAbilityId); if (iter != listenerMap_.end()) { @@ -367,7 +368,7 @@ sptr SystemAbilityManager::CheckSystemAbility(int32_t systemAbili int32_t SystemAbilityManager::RemoveSystemAbility(int32_t systemAbilityId) { - HILOGI("%s called (name)", __func__); + HILOGI("%{public}s called (name)", __func__); if (!CheckInputSysAbilityId(systemAbilityId)) { HILOGW("RemoveSystemAbility systemAbilityId:%{public}d", systemAbilityId); return ERR_INVALID_VALUE; @@ -384,7 +385,7 @@ int32_t SystemAbilityManager::RemoveSystemAbility(int32_t systemAbilityId) ability->RemoveDeathRecipient(abilityDeath_); } (void)abilityMap_.erase(itSystemAbility); - HILOGI("%s called, systemAbilityId : %{public}d, size : %{public}zu", __func__, systemAbilityId, + HILOGI("%{public}s called, systemAbilityId : %{public}d, size : %{public}zu", __func__, systemAbilityId, abilityMap_.size()); } SendSystemAbilityRemovedMsg(systemAbilityId); @@ -393,7 +394,7 @@ int32_t SystemAbilityManager::RemoveSystemAbility(int32_t systemAbilityId) int32_t SystemAbilityManager::RemoveSystemAbility(const sptr& ability) { - HILOGI("%s called, (ability)", __func__); + HILOGI("%{public}s called, (ability)", __func__); if (ability == nullptr) { HILOGW("ability is nullptr "); return ERR_INVALID_VALUE; @@ -409,7 +410,7 @@ int32_t SystemAbilityManager::RemoveSystemAbility(const sptr& abi if (abilityDeath_ != nullptr) { ability->RemoveDeathRecipient(abilityDeath_); } - HILOGI("%s called, systemAbilityId:%{public}d removed, size : %{public}zu", __func__, saId, + HILOGI("%{public}s called, systemAbilityId:%{public}d removed, size : %{public}zu", __func__, saId, abilityMap_.size()); break; } @@ -435,7 +436,7 @@ vector SystemAbilityManager::ListSystemAbilities(uint32_t dumpFlags) int32_t SystemAbilityManager::SubscribeSystemAbility(int32_t systemAbilityId, const sptr& listener) { - HILOGI("%s called", __func__); + HILOGI("%{public}s called", __func__); if (!CheckInputSysAbilityId(systemAbilityId) || listener == nullptr) { HILOGW("SubscribeSystemAbility systemAbilityId or listener invalid!"); return ERR_INVALID_VALUE; @@ -503,7 +504,7 @@ void SystemAbilityManager::UnSubscribeSystemAbilityLocked( int32_t SystemAbilityManager::UnSubscribeSystemAbility(int32_t systemAbilityId, const sptr& listener) { - HILOGI("%s called", __func__); + HILOGI("%{public}s called", __func__); if (!CheckInputSysAbilityId(systemAbilityId) || listener == nullptr) { HILOGW("UnSubscribeSystemAbility systemAbilityId or listener invalid!"); return ERR_INVALID_VALUE; @@ -545,7 +546,7 @@ void SystemAbilityManager::NotifyRemoteSaDied(const std::u16string& name) if (dBinderService_ != nullptr) { std::string nodeId = TransformDeviceId(deviceId, NODE_ID, false); dBinderService_->NoticeServiceDie(saName, nodeId); - HILOGD("NotifyRemoteSaDied, serviceName is %s, deviceId is %s", + HILOGD("NotifyRemoteSaDied, serviceName is %{public}s, deviceId is %{public}s", Str16ToStr8(saName).c_str(), nodeId.c_str()); } } @@ -554,7 +555,7 @@ void SystemAbilityManager::NotifyRemoteDeviceOffline(const std::string& deviceId { if (dBinderService_ != nullptr) { dBinderService_->NoticeDeviceDie(deviceId); - HILOGD("NotifyRemoteDeviceOffline, deviceId is %s", deviceId.c_str()); + HILOGD("NotifyRemoteDeviceOffline, deviceId is %{public}s", deviceId.c_str()); } } @@ -571,7 +572,7 @@ void SystemAbilityManager::ParseRemoteSaName(const std::u16string& name, std::st int32_t SystemAbilityManager::AddSystemAbility(int32_t systemAbilityId, const sptr& ability, const SAExtraProp& extraProp) { - HILOGI("%s called", __func__); + HILOGI("%{public}s called", __func__); if (!CheckInputSysAbilityId(systemAbilityId) || ability == nullptr) { HILOGE("AddSystemAbilityExtra input params is invalid."); return ERR_INVALID_VALUE; diff --git a/services/samgr/native/source/system_ability_status_change_proxy.cpp b/services/samgr/native/source/system_ability_status_change_proxy.cpp index 2816a839..cd507c3a 100644 --- a/services/samgr/native/source/system_ability_status_change_proxy.cpp +++ b/services/samgr/native/source/system_ability_status_change_proxy.cpp @@ -39,6 +39,7 @@ void SystemAbilityStatusChangeProxy::OnRemoveSystemAbility(int32_t systemAbility bool SystemAbilityStatusChangeProxy::SendRequestInner(uint32_t code, int32_t systemAbilityId, const std::string& deviceId) { + HILOGE("SystemAbilityStatusChangeProxy::SendRequestInner enter, code : %{public}u, SA : %{public}d", code, systemAbilityId); if (systemAbilityId <= 0) { HILOGE("SendRequestInner saId:%{public}d is invalid!", systemAbilityId); return false; -- Gitee