diff --git a/services/backup_sa/src/module_ipc/svc_session_manager.cpp b/services/backup_sa/src/module_ipc/svc_session_manager.cpp index 4293b6dc6722f78d676d78baf50d3f7d057b53a3..a575474a1c08856f84e9d317f855ab9c2cc4b449 100644 --- a/services/backup_sa/src/module_ipc/svc_session_manager.cpp +++ b/services/backup_sa/src/module_ipc/svc_session_manager.cpp @@ -310,19 +310,6 @@ wptr SvcSessionManager::GetExtConnection(const BundleName & return wptr(it->second.backUpConnection); } -void SvcSessionManager::UpdateDfxInfo(const std::string &bundleName, uint64_t uniqId) -{ - auto backupConnection = GetExtConnection(bundleName); - if (backupConnection == nullptr) { - return; - } - auto proxy = backupConnection->GetBackupExtProxy(); - if (proxy == nullptr) { - return; - } - proxy->UpdateDfxInfo(uniqId, backupConnection->GetConnectSpan(), bundleName); -} - std::weak_ptr SvcSessionManager::GetSAExtConnection(const BundleName &bundleName) { HILOGD("svcMrg:GetExt, bundleName:%{public}s", bundleName.c_str()); @@ -1210,7 +1197,11 @@ bool SvcSessionManager::CleanAndCheckIfNeedWait(ErrCode &ret, std::vector lock(lock_); for (auto it = impl_.backupExtNameMap.begin(); it != impl_.backupExtNameMap.end();) { + HILOGI("ExtensionAbility bundleName: %{public}s, schedAction: %{public}d, isInPublishFile: %{public}d", + it->first.c_str(), it->second.schedAction, it->second.isInPublishFile); if (it->second.schedAction == BConstants::ServiceSchedAction::WAIT) { + HILOGI("Clear extensionAbility bundleName: %{public}s, schedAction: %{public}d", + it->first.c_str(), it->second.schedAction); it = impl_.backupExtNameMap.erase(it); } else if (it->second.schedAction == BConstants::ServiceSchedAction::START || (it->second.schedAction == BConstants::ServiceSchedAction::RUNNING && !it->second.isInPublishFile)) { @@ -1221,14 +1212,14 @@ bool SvcSessionManager::CleanAndCheckIfNeedWait(ErrCode &ret, std::vectorsecond.backUpConnection; if (backUpConnection == nullptr) { - HILOGE("Clear session error, backUpConnection is empty"); + HILOGE("Clear session error, backUpConnection is empty, bundleName: %{public}s", it->first.c_str()); it = impl_.backupExtNameMap.erase(it); continue; } auto proxy = backUpConnection->GetBackupExtProxy(); // start action if (proxy == nullptr) { - HILOGE("Clear session error, backUpConnection is empty"); + HILOGE("Clear session error, BackupExtProxy is empty, bundleName: %{public}s", it->first.c_str()); backUpConnection->DisconnectBackupExtAbility(); it = impl_.backupExtNameMap.erase(it); continue; @@ -1244,6 +1235,7 @@ bool SvcSessionManager::CleanAndCheckIfNeedWait(ErrCode &ret, std::vectorDisconnectBackupExtAbility(); + HILOGI("Disconnect, extensionAbility, bundleName: %{public}s", it->first.c_str()); it = impl_.backupExtNameMap.erase(it); } else { ++it;