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

Fix couple of bugs in the meminfo report.

Browse Source 
. 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.
This commit is contained in:
Grace Kloba
2009-07-08 23:32:25 -07:00
parent afefa49abc
commit bd51116a53
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/jni/android_os_Debug.cpp
View File

@@ -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;
}
}
}