diff options
| author | Joshua Schwarz <joshuaschwarz@google.com> | 2016-07-01 23:06:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-01 23:06:30 +0000 |
| commit | f05cc56735db8c8b925fe486fe93d68c6efc197e (patch) | |
| tree | d6aff6b371b0e74a48cda0892a14e1b50df2b64b /src/com/android | |
| parent | 8438477ac7130f93f9a3f7e1229147b3d92c9663 (diff) | |
| parent | 64538e222e7526bc2483cb5d28636f9823470189 (diff) | |
| download | loganalysis-f05cc56735db8c8b925fe486fe93d68c6efc197e.tar.gz | |
Merge "Add app summary metrics to memory health parser."
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/loganalysis/item/MemoryHealthItem.java | 9 | ||||
| -rw-r--r-- | src/com/android/loganalysis/parser/MemoryHealthParser.java | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/com/android/loganalysis/item/MemoryHealthItem.java b/src/com/android/loganalysis/item/MemoryHealthItem.java index 92b5f11..fa33be6 100644 --- a/src/com/android/loganalysis/item/MemoryHealthItem.java +++ b/src/com/android/loganalysis/item/MemoryHealthItem.java @@ -37,6 +37,15 @@ public class MemoryHealthItem extends GenericItem { public static final String NATIVE_PEAK = "native_peak"; public static final String PSS_PEAK = "pss_peak"; + public static final String SUMMARY_JAVA_HEAP_AVG = "summary_java_heap_avg"; + public static final String SUMMARY_NATIVE_HEAP_AVG = "summary_native_heap_avg"; + public static final String SUMMARY_CODE_AVG = "summary_code_avg"; + public static final String SUMMARY_STACK_AVG = "summary_stack_avg"; + public static final String SUMMARY_GRAPHICS_AVG = "summary_graphics_avg"; + public static final String SUMMARY_OTHER_AVG = "summary_other_avg"; + public static final String SUMMARY_SYSTEM_AVG = "summary_system_avg"; + public static final String SUMMARY_OVERALL_PSS_AVG = "summary_overall_pss_avg"; + public MemoryHealthItem(Map<String, Map<String, Long>> foreground, Map<String, Map<String, Long>> background) { super(new HashSet<String>(Arrays.asList(FOREGROUND, BACKGROUND))); diff --git a/src/com/android/loganalysis/parser/MemoryHealthParser.java b/src/com/android/loganalysis/parser/MemoryHealthParser.java index 8d5b792..fd44662 100644 --- a/src/com/android/loganalysis/parser/MemoryHealthParser.java +++ b/src/com/android/loganalysis/parser/MemoryHealthParser.java @@ -43,6 +43,15 @@ public class MemoryHealthParser implements IParser { mappings.put("Peak Dalvik Heap", MemoryHealthItem.DALVIK_PEAK); mappings.put("Peak Native Heap", MemoryHealthItem.NATIVE_PEAK); mappings.put("Peak PSS", MemoryHealthItem.PSS_PEAK); + + mappings.put("Average Summary Java Heap", MemoryHealthItem.SUMMARY_JAVA_HEAP_AVG); + mappings.put("Average Summary Native Heap", MemoryHealthItem.SUMMARY_NATIVE_HEAP_AVG); + mappings.put("Average Summary Code", MemoryHealthItem.SUMMARY_CODE_AVG); + mappings.put("Average Summary Stack", MemoryHealthItem.SUMMARY_STACK_AVG); + mappings.put("Average Summary Graphics", MemoryHealthItem.SUMMARY_GRAPHICS_AVG); + mappings.put("Average Summary Other", MemoryHealthItem.SUMMARY_OTHER_AVG); + mappings.put("Average Summary System", MemoryHealthItem.SUMMARY_SYSTEM_AVG); + mappings.put("Average Summary Overall Pss", MemoryHealthItem.SUMMARY_OVERALL_PSS_AVG); SECTION_MAPPINGS = Collections.unmodifiableMap(mappings); } |