diff options
author | Grace Kloba <klobag@google.com> | 2009-08-11 12:43:08 -0700 |
---|---|---|
committer | Grace Kloba <klobag@google.com> | 2009-08-11 12:43:08 -0700 |
commit | 628e086664a4b4aea1365652227f53237ef4f588 (patch) | |
tree | b435cc45557dc0ed2a2d165e8dd6a793f67eacaa /core | |
parent | b8560b66fd2bdf465a8c7fad983f2236778e8106 (diff) | |
download | frameworks_base-628e086664a4b4aea1365652227f53237ef4f588.zip frameworks_base-628e086664a4b4aea1365652227f53237ef4f588.tar.gz frameworks_base-628e086664a4b4aea1365652227f53237ef4f588.tar.bz2 |
DO NOT MERGE. This is merged from master.
Fix couple of bugs in the meminfo report.
. added the new "/data/dalvik-cache/" to dalvik heap
. shortened the starting line's length from 40 to 30 to handle the case where there is no name
. fixed the pri/shared for others. It was swapped.
Diffstat (limited to 'core')
-rw-r--r-- | core/jni/android_os_Debug.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index a6b63d8..b4c60f1 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -129,6 +129,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats) isDalvikHeap = 1; } else if (strstr(line, "/dalvik-heap-bitmap/")) { isDalvikHeap = 1; + } else if (strstr(line, "/data/dalvik-cache/")) { + isDalvikHeap = 1; } else if (strstr(line, "/tmp/sqlite-heap")) { isSqliteHeap = 1; } @@ -158,9 +160,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats) private_dirty = temp; } else if (sscanf(line, "Referenced: %d kB", &temp) == 1) { referenced = temp; - } else if (strlen(line) > 40 && line[8] == '-' && line[17] == ' ') { + } else if (strlen(line) > 30 && line[8] == '-' && line[17] == ' ') { // looks like a new mapping - // example: "0000a000-00232000 rwxp 0000a000 00:00 0 [heap]" + // example: "10000000-10001000 ---p 10000000 00:00 0" break; } } @@ -178,8 +180,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats) // ignore } else { stats->otherPss += pss; - stats->otherPrivateDirty += shared_dirty; - stats->otherSharedDirty += private_dirty; + stats->otherPrivateDirty += private_dirty; + stats->otherSharedDirty += shared_dirty; } } } |