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

Fix some bugs in dumpsys meminfo attribution

Browse Source 
ART image files can end with either .art or .art] depending on where
they are loaded from, add handling for this.

Also fix subheap attribution to HEAP_ART_BOOT and HEAP_ART_APP for
the app image case.

Test: adb shell dumpsys meminfo `pid system_server`
Bug: 134509632

Change-Id: I98882466d7c2f31179b095b803af67d21c17306c
This commit is contained in:
Mathieu Chartier
2019-06-04 13:11:16 -07:00
parent eabafd5ceb
commit 8da8cbfefc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_os_Debug.cpp
View File

@@ -289,14 +289,14 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss)
} else if (base::EndsWith(name, ".oat")) {
which_heap = HEAP_OAT;
is_swappable = true;
} else if (base::EndsWith(name, ".art")) {
} else if (base::EndsWith(name, ".art") || base::EndsWith(name, ".art]")) {
which_heap = HEAP_ART;
// Handle system@framework@boot* and system/framework/boot*
if ((strstr(name.c_str(), "@boot") != nullptr) ||
(strstr(name.c_str(), "/boot"))) {
sub_heap = HEAP_DEX_BOOT_VDEX;
sub_heap = HEAP_ART_BOOT;
} else {
sub_heap = HEAP_DEX_APP_VDEX;
sub_heap = HEAP_ART_APP;
}
is_swappable = true;
} else if (base::StartsWith(name, "/dev/")) {