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

Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev

Browse Source
This commit is contained in:
Mathieu Chartier
2014-12-09 01:24:49 +00:00
committed by Android (Google) Code Review
parent 0f78ad87f0 25c5e2b12d
commit 52070f81f2
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/os/Debug.java
View File

@@ -168,7 +168,7 @@ public final class Debug
public static final int NUM_OTHER_STATS = 17;
/** @hide */
public static final int NUM_DVK_STATS = 5;
public static final int NUM_DVK_STATS = 8;
/** @hide */
public static final int NUM_CATEGORIES = 7;
@@ -314,6 +314,9 @@ public final class Debug
case 19: return ".LinearAlloc";
case 20: return ".GC";
case 21: return ".JITCache";
case 22: return ".Zygote";
case 23: return ".NonMoving";
case 24: return ".IndirectRef";
default: return "????";
}
}

15
core/jni/android_os_Debug.cpp
View File

@@ -70,6 +70,9 @@ enum {
HEAP_DALVIK_LINEARALLOC,
HEAP_DALVIK_ACCOUNTING,
HEAP_DALVIK_CODE_CACHE,
HEAP_DALVIK_ZYGOTE,
HEAP_DALVIK_NON_MOVING,
HEAP_DALVIK_INDIRECT_REFERENCE_TABLE,
_NUM_HEAP,
_NUM_EXCLUSIVE_HEAP = HEAP_OTHER_MEMTRACK+1,
@@ -274,15 +277,21 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
if (strstr(name, "/dev/ashmem/dalvik-LinearAlloc") == name) {
subHeap = HEAP_DALVIK_LINEARALLOC;
} else if ((strstr(name, "/dev/ashmem/dalvik-alloc space") == name) ||
(strstr(name, "/dev/ashmem/dalvik-main space") == name) ||
(strstr(name, "/dev/ashmem/dalvik-zygote space") == name) ||
(strstr(name, "/dev/ashmem/dalvik-non moving space") == name)) {
(strstr(name, "/dev/ashmem/dalvik-main space") == name)) {
// This is the regular Dalvik heap.
whichHeap = HEAP_DALVIK;
subHeap = HEAP_DALVIK_NORMAL;
} else if (strstr(name, "/dev/ashmem/dalvik-large object space") == name) {
whichHeap = HEAP_DALVIK;
subHeap = HEAP_DALVIK_LARGE;
} else if (strstr(name, "/dev/ashmem/dalvik-non moving space") == name) {
whichHeap = HEAP_DALVIK;
subHeap = HEAP_DALVIK_NON_MOVING;
} else if (strstr(name, "/dev/ashmem/dalvik-zygote space") == name) {
whichHeap = HEAP_DALVIK;
subHeap = HEAP_DALVIK_ZYGOTE;
} else if (strstr(name, "/dev/ashmem/dalvik-indirect ref") == name) {
subHeap = HEAP_DALVIK_INDIRECT_REFERENCE_TABLE;
} else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name) {
subHeap = HEAP_DALVIK_CODE_CACHE;
} else {