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

Merge "Few more small meminfo improvements." into lmp-mr1-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2014-11-04 00:41:53 +00:00
committed by Android (Google) Code Review
parent 99a6c1cbe8 1842930762
commit d1f1ea76e8
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,7 @@ public final class Debug
public int otherSwappedOut; public int otherSwappedOut;
/** @hide */ /** @hide */
public static final int NUM_OTHER_STATS = 16; public static final int NUM_OTHER_STATS = 17;
/** @hide */ /** @hide */
public static final int NUM_DVK_STATS = 5; public static final int NUM_DVK_STATS = 5;
@@ -296,23 +296,24 @@ public final class Debug
case 1: return "Stack"; case 1: return "Stack";
case 2: return "Cursor"; case 2: return "Cursor";
case 3: return "Ashmem"; case 3: return "Ashmem";
case 4: return "Other dev"; case 4: return "Gfx driver";
case 5: return ".so mmap"; case 5: return "Other dev";
case 6: return ".jar mmap"; case 6: return ".so mmap";
case 7: return ".apk mmap"; case 7: return ".jar mmap";
case 8: return ".ttf mmap"; case 8: return ".apk mmap";
case 9: return ".dex mmap"; case 9: return ".ttf mmap";
case 10: return "code mmap"; case 10: return ".dex mmap";
case 11: return "image mmap"; case 11: return ".oat mmap";
case 12: return "Other mmap"; case 12: return ".art mmap";
case 13: return "Graphics"; case 13: return "Other mmap";
case 14: return "GL"; case 14: return "Graphics";
case 15: return "Memtrack"; case 15: return "GL";
case 16: return ".Heap"; case 16: return "Memtrack";
case 17: return ".LOS"; case 17: return ".Heap";
case 18: return ".LinearAlloc"; case 18: return ".LOS";
case 19: return ".GC"; case 19: return ".LinearAlloc";
case 20: return ".JITCache"; case 20: return ".GC";
case 21: return ".JITCache";
default: return "????"; default: return "????";
} }
} }

8
core/jni/android_os_Debug.cpp
View File

@@ -46,10 +46,12 @@ enum {
HEAP_UNKNOWN, HEAP_UNKNOWN,
HEAP_DALVIK, HEAP_DALVIK,
HEAP_NATIVE, HEAP_NATIVE,
HEAP_DALVIK_OTHER, HEAP_DALVIK_OTHER,
HEAP_STACK, HEAP_STACK,
HEAP_CURSOR, HEAP_CURSOR,
HEAP_ASHMEM, HEAP_ASHMEM,
HEAP_GL_DEV,
HEAP_UNKNOWN_DEV, HEAP_UNKNOWN_DEV,
HEAP_SO, HEAP_SO,
HEAP_JAR, HEAP_JAR,
@@ -297,7 +299,11 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
} else if (strncmp(name, "[stack", 6) == 0) { } else if (strncmp(name, "[stack", 6) == 0) {
whichHeap = HEAP_STACK; whichHeap = HEAP_STACK;
} else if (strncmp(name, "/dev/", 5) == 0) { } else if (strncmp(name, "/dev/", 5) == 0) {
whichHeap = HEAP_UNKNOWN_DEV; if (strncmp(name, "/dev/kgsl-3d0", 13) == 0) {
whichHeap = HEAP_GL_DEV;
} else {
whichHeap = HEAP_UNKNOWN_DEV;
}
} else if (nameLen > 3 && strcmp(name+nameLen-3, ".so") == 0) { } else if (nameLen > 3 && strcmp(name+nameLen-3, ".so") == 0) {
whichHeap = HEAP_SO; whichHeap = HEAP_SO;
is_swappable = true; is_swappable = true;