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

Optimize FilterApkAssets by caching config

Browse Source 
ResTable_config of every ResTable_type is read from device every time
AssetManager::RebuildFilterList is invoked. For large APKs (like
framework-res.apk), this causes a large number of page faults
when accessing the config from disk. The configs are also used in the
slow path of AssetManager::FindEntryInternal, which makes it even
slower. Instead cache the config on the TypeSpec of its ApkAsset.

Bug: 177247024
Test: libandroidfw_tests
Change-Id: I66d507c4eeb2399f7558f3d9dfc53c157129ada0
This commit is contained in:
Ryan Mitchell
2021-01-11 16:01:35 -08:00
parent fb4d09cadd
commit 14e8ade9a9
8 changed files with 245 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/aapt2/process/SymbolTable.cpp
View File

@@ -227,8 +227,7 @@ bool AssetManagerSymbolSource::AddAssetPath(const StringPiece& path) {
apk_assets.push_back(apk_asset.get());
}
asset_manager_.SetApkAssets(apk_assets, true /* invalidate_caches */,
false /* filter_incompatible_configs */);
asset_manager_.SetApkAssets(apk_assets);
return true;
}
return false;
@@ -351,9 +350,9 @@ std::unique_ptr<SymbolTable::Symbol> AssetManagerSymbolSource::FindByName(
return true;
}
auto value = asset_manager_.GetResource(res_id.id, true /* may_be_bag */);
if (value.has_value()) {
type_spec_flags = value->flags;
auto flags = asset_manager_.GetResourceTypeSpecFlags(res_id.id);
if (flags.has_value()) {
type_spec_flags = *flags;
found = true;
return false;
}
@@ -406,8 +405,8 @@ std::unique_ptr<SymbolTable::Symbol> AssetManagerSymbolSource::FindById(
return {};
}
auto value = asset_manager_.GetResource(id.id, true /* may_be_bag */);
if (!value.has_value()) {
auto flags = asset_manager_.GetResourceTypeSpecFlags(id.id);
if (!flags.has_value()) {
return {};
}
@@ -422,7 +421,7 @@ std::unique_ptr<SymbolTable::Symbol> AssetManagerSymbolSource::FindById(
}
if (s) {
s->is_public = (value->flags & android::ResTable_typeSpec::SPEC_PUBLIC) != 0;
s->is_public = (*flags & android::ResTable_typeSpec::SPEC_PUBLIC) != 0;
return s;
}
return {};