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

am 4c7518e1: am 9a4cdf5c: Merge "Look at map extensions before /dev/ + ashmem." into mnc-dev

Browse Source 
* commit '4c7518e1ef2ab17c57022bf0dc4c1b9990ae00c3':
  Look at map extensions before /dev/ + ashmem.
This commit is contained in:
Mathieu Chartier
2015-05-01 19:13:31 +00:00
committed by Android Git Automerger
parent c04a5df9c5 4c7518e1ef
commit 292ef72cc4
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
core/jni/android_os_Debug.cpp
View File

@@ -270,6 +270,35 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
if ((strstr(name, "[heap]") == name)) { if ((strstr(name, "[heap]") == name)) {
whichHeap = HEAP_NATIVE; whichHeap = HEAP_NATIVE;
} else if (strncmp(name, "[anon:libc_malloc]", 18) == 0) {
whichHeap = HEAP_NATIVE;
} else if (strncmp(name, "[stack", 6) == 0) {
whichHeap = HEAP_STACK;
} else if (nameLen > 3 && strcmp(name+nameLen-3, ".so") == 0) {
whichHeap = HEAP_SO;
is_swappable = true;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".jar") == 0) {
whichHeap = HEAP_JAR;
is_swappable = true;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".apk") == 0) {
whichHeap = HEAP_APK;
is_swappable = true;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".ttf") == 0) {
whichHeap = HEAP_TTF;
is_swappable = true;
} else if ((nameLen > 4 && strstr(name, ".dex") != NULL) ||
(nameLen > 5 && strcmp(name+nameLen-5, ".odex") == 0)) {
whichHeap = HEAP_DEX;
is_swappable = true;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".oat") == 0) {
whichHeap = HEAP_OAT;
is_swappable = true;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".art") == 0) {
whichHeap = HEAP_ART;
is_swappable = true;
} else if (strncmp(name, "/dev/", 5) == 0) {
if (strncmp(name, "/dev/kgsl-3d0", 13) == 0) {
whichHeap = HEAP_GL_DEV;
} else if (strncmp(name, "/dev/ashmem", 11) == 0) { } else if (strncmp(name, "/dev/ashmem", 11) == 0) {
if (strncmp(name, "/dev/ashmem/dalvik-", 19) == 0) { if (strncmp(name, "/dev/ashmem/dalvik-", 19) == 0) {
whichHeap = HEAP_DALVIK_OTHER; whichHeap = HEAP_DALVIK_OTHER;
@@ -303,38 +332,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
} else { } else {
whichHeap = HEAP_ASHMEM; whichHeap = HEAP_ASHMEM;
} }
} else if (strncmp(name, "[anon:libc_malloc]", 18) == 0) {
whichHeap = HEAP_NATIVE;
} else if (strncmp(name, "[stack", 6) == 0) {
whichHeap = HEAP_STACK;
} else if (strncmp(name, "/dev/", 5) == 0) {
if (strncmp(name, "/dev/kgsl-3d0", 13) == 0) {
whichHeap = HEAP_GL_DEV;
} else { } else {
whichHeap = HEAP_UNKNOWN_DEV; whichHeap = HEAP_UNKNOWN_DEV;
} }
} else if (nameLen > 3 && strcmp(name+nameLen-3, ".so") == 0) {
whichHeap = HEAP_SO;
is_swappable = true;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".jar") == 0) {
whichHeap = HEAP_JAR;
is_swappable = true;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".apk") == 0) {
whichHeap = HEAP_APK;
is_swappable = true;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".ttf") == 0) {
whichHeap = HEAP_TTF;
is_swappable = true;
} else if ((nameLen > 4 && strcmp(name+nameLen-4, ".dex") == 0) ||
(nameLen > 5 && strcmp(name+nameLen-5, ".odex") == 0)) {
whichHeap = HEAP_DEX;
is_swappable = true;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".oat") == 0) {
whichHeap = HEAP_OAT;
is_swappable = true;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".art") == 0) {
whichHeap = HEAP_ART;
is_swappable = true;
} else if (strncmp(name, "[anon:", 6) == 0) { } else if (strncmp(name, "[anon:", 6) == 0) {
whichHeap = HEAP_UNKNOWN; whichHeap = HEAP_UNKNOWN;
} else if (nameLen > 0) { } else if (nameLen > 0) {