Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[res] Change staged alias container to vector

Browse Source 
Sorted vector is more efficient than a map for all cases but
if it gets modified a lot. Here we never modify it after loading

Bug: 237583012
Test: build + boot
Change-Id: I7d9f1fe38bd8a6d722b9cacaa7034abcdb02d743
This commit is contained in:
Yurii Zubrytskyi
2022-11-14 23:45:58 -08:00
parent 9eb44c9727
commit 6e8c603925
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libs/androidfw/LoadedArsc.cpp
View File

@@ -645,16 +645,15 @@ std::unique_ptr<const LoadedPackage> LoadedPackage::Load(const Chunk& chunk,
}
std::string name;
util::ReadUtf16StringFromDevice(overlayable->name, arraysize(overlayable->name), &name);
util::ReadUtf16StringFromDevice(overlayable->name, std::size(overlayable->name), &name);
std::string actor;
util::ReadUtf16StringFromDevice(overlayable->actor, arraysize(overlayable->actor), &actor);
if (loaded_package->overlayable_map_.find(name) !=
loaded_package->overlayable_map_.end()) {
LOG(ERROR) << "Multiple <overlayable> blocks with the same name '" << name << "'.";
util::ReadUtf16StringFromDevice(overlayable->actor, std::size(overlayable->actor), &actor);
auto [it, inserted] =
loaded_package->overlayable_map_.emplace(name, actor);
if (!inserted) {
LOG(ERROR) << "Multiple <overlayable> blocks with the same name '" << it->first << "'.";
return {};
}
loaded_package->overlayable_map_.emplace(name, actor);
// Iterate over the overlayable policy chunks contained within the overlayable chunk data
ChunkIterator overlayable_iter(child_chunk.data_ptr(), child_chunk.data_size());
@@ -736,6 +735,7 @@ std::unique_ptr<const LoadedPackage> LoadedPackage::Load(const Chunk& chunk,
const auto entry_end = entry_begin + dtohl(lib_alias->count);
std::unordered_set<uint32_t> finalized_ids;
finalized_ids.reserve(entry_end - entry_begin);
loaded_package->alias_id_map_.reserve(entry_end - entry_begin);
for (auto entry_iter = entry_begin; entry_iter != entry_end; ++entry_iter) {
if (!entry_iter) {
LOG(ERROR) << "NULL ResTable_staged_alias_entry record??";
@@ -749,13 +749,20 @@ std::unique_ptr<const LoadedPackage> LoadedPackage::Load(const Chunk& chunk,
}
auto staged_id = dtohl(entry_iter->stagedResId);
auto [_, success] = loaded_package->alias_id_map_.emplace(staged_id, finalized_id);
if (!success) {
loaded_package->alias_id_map_.emplace_back(staged_id, finalized_id);
}
std::sort(loaded_package->alias_id_map_.begin(), loaded_package->alias_id_map_.end(),
[](auto&& l, auto&& r) { return l.first < r.first; });
const auto duplicate_it =
std::adjacent_find(loaded_package->alias_id_map_.begin(),
loaded_package->alias_id_map_.end(),
[](auto&& l, auto&& r) { return l.first == r.first; });
if (duplicate_it != loaded_package->alias_id_map_.end()) {
LOG(ERROR) << StringPrintf("Repeated staged resource id '%08x' in staged aliases.",
staged_id);
duplicate_it->first);
return {};
}
}
} break;
default:

6
libs/androidfw/include/androidfw/LoadedArsc.h
View File

@@ -275,7 +275,7 @@ class LoadedPackage {
return overlayable_map_;
}
const std::map<uint32_t, uint32_t>& GetAliasResourceIdMap() const {
const std::vector<std::pair<uint32_t, uint32_t>>& GetAliasResourceIdMap() const {
return alias_id_map_;
}
@@ -295,8 +295,8 @@ class LoadedPackage {
std::unordered_map<uint8_t, TypeSpec> type_specs_;
ByteBucketArray<uint32_t> resource_ids_;
std::vector<DynamicPackageEntry> dynamic_package_map_;
std::vector<const std::pair<OverlayableInfo, std::unordered_set<uint32_t>>> overlayable_infos_;
std::map<uint32_t, uint32_t> alias_id_map_;
std::vector<std::pair<OverlayableInfo, std::unordered_set<uint32_t>>> overlayable_infos_;
std::vector<std::pair<uint32_t, uint32_t>> alias_id_map_;
// A map of overlayable name to actor
std::unordered_map<std::string, std::string> overlayable_map_;