openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-25 12:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

!5317 修复访问map未加锁导致crash

Browse Source 
Merge pull request !5317 from 于文泽/nullptr
This commit is contained in:
openharmony_ci
2023-04-26 08:29:03 +00:00
committed by Gitee
parent 893aef6840 1c53b415d6
commit 446efeafd7
2 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/abilitymgr/include/ability_connect_manager.h
+2 -2
View File
@@ -224,10 +224,10 @@ public:
*/
void OnAbilityDied(const std::shared_ptr<AbilityRecord> &abilityRecord, int32_t currentUserId);
void DumpState(std::vector<std::string> &info, bool isClient, const std::string &args = "") const;
void DumpState(std::vector<std::string> &info, bool isClient, const std::string &args = "");
void DumpStateByUri(std::vector<std::string> &info, bool isClient, const std::string &args,
std::vector<std::string> &params) const;
std::vector<std::string> &params);
void StopAllExtensions();
services/abilitymgr/src/ability_connect_manager.cpp
+32 -17
View File
@@ -1402,41 +1402,56 @@ void AbilityConnectManager::RestartAbility(const std::shared_ptr<AbilityRecord>
}
}
void AbilityConnectManager::DumpState(std::vector<std::string> &info, bool isClient, const std::string &args) const
void AbilityConnectManager::DumpState(std::vector<std::string> &info, bool isClient, const std::string &args)
{
HILOG_INFO("DumpState args:%{public}s.", args.c_str());
ServiceMapType serviceMapBack;
{
std::lock_guard<std::recursive_mutex> guard(Lock_);
serviceMapBack = serviceMap_;
}
if (!args.empty()) {
auto it = std::find_if(serviceMap_.begin(), serviceMap_.end(), [&args](const auto &service) {
auto it = std::find_if(serviceMapBack.begin(), serviceMapBack.end(), [&args](const auto &service) {
return service.first.compare(args) == 0;
});
if (it != serviceMap_.end()) {
if (it != serviceMapBack.end()) {
info.emplace_back("uri [ " + it->first + " ]");
it->second->DumpService(info, isClient);
if (it->second != nullptr) {
it->second->DumpService(info, isClient);
}
} else {
info.emplace_back(args + ": Nothing to dump.");
}
} else {
auto abilityMgr = DelayedSingleton<AbilityManagerService>::GetInstance();
info.emplace_back(" ExtensionRecords:");
for (auto &&service : serviceMap_) {
for (auto &&service : serviceMapBack) {
info.emplace_back(" uri [" + service.first + "]");
service.second->DumpService(info, isClient);
if (service.second != nullptr) {
service.second->DumpService(info, isClient);
}
}
}
}
void AbilityConnectManager::DumpStateByUri(std::vector<std::string> &info, bool isClient, const std::string &args,
std::vector<std::string> &params) const
std::vector<std::string> &params)
{
HILOG_INFO("DumpState args:%{public}s, params size: %{public}zu", args.c_str(), params.size());
auto it = std::find_if(serviceMap_.begin(), serviceMap_.end(), [&args](const auto &service) {
return service.first.compare(args) == 0;
});
if (it != serviceMap_.end()) {
info.emplace_back("uri [ " + it->first + " ]");
it->second->DumpService(info, params, isClient);
} else {
info.emplace_back(args + ": Nothing to dump.");
HILOG_INFO("DumpStateByUri args:%{public}s, params size: %{public}zu", args.c_str(), params.size());
std::shared_ptr<AbilityRecord> extensionAbilityRecord = nullptr;
{
std::lock_guard<std::recursive_mutex> guard(Lock_);
auto it = std::find_if(serviceMap_.begin(), serviceMap_.end(), [&args](const auto &service) {
return service.first.compare(args) == 0;
});
if (it != serviceMap_.end()) {
info.emplace_back("uri [ " + it->first + " ]");
extensionAbilityRecord = it->second;
} else {
info.emplace_back(args + ": Nothing to dump.");
}
}
if (extensionAbilityRecord != nullptr) {
extensionAbilityRecord->DumpService(info, params, isClient);
}
}