commit 09d8543dcebc9815e397957be01b5a2dd9e17643
author Ioannis Ilkos <ilkos@google.com> Mon Aug 05 17:54:08 2019 +0100
committer Ioannis Ilkos <ilkos@google.com> Mon Aug 05 17:54:08 2019 +0100
tree 80b6234516d818a58fa9a01b6dee31b4e1124ef2
parent 0d11736af88c1ba114ef0dddc5ed3cdf64317d0d

Combine heap profiler stats

We have positive allocation site deltas and total stats per frame.
Neither of these is entirely what we need, I am combining them to
HeapProfileCallsiteStats which has totals and deltas per flattened
callsite.

Bug: b/133745684
Change-Id: I3978b560633d9b2bf8df0721ae4ac96e67fc9c85

Android.bp

diff --git a/Android.bp b/Android.bp
index 74237e3..7be3725 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,8 +31,7 @@
     "src/trace_processor/metrics/android/android_startup_cpu.sql",
     "src/trace_processor/metrics/android/android_startup_launches.sql",
     "src/trace_processor/metrics/android/android_task_state.sql",
-    "src/trace_processor/metrics/android/heap_profile.sql",
-    "src/trace_processor/metrics/android/heap_profile_frame_stats.sql",
+    "src/trace_processor/metrics/android/heap_profile_callsite_stats.sql",
     "src/trace_processor/metrics/android/mem_stats_priority_breakdown.sql",
     "src/trace_processor/metrics/android/process_mem.sql",
     "src/trace_processor/metrics/android/process_unagg_mem_view.sql",
@@ -1303,8 +1302,7 @@
   srcs: [
     "protos/perfetto/metrics/android/batt_metric.proto",
     "protos/perfetto/metrics/android/cpu_metric.proto",
-    "protos/perfetto/metrics/android/heap_profile.proto",
-    "protos/perfetto/metrics/android/heap_profile_frame_stats.proto",
+    "protos/perfetto/metrics/android/heap_profile_callsite_stats.proto",
     "protos/perfetto/metrics/android/ion_metric.proto",
     "protos/perfetto/metrics/android/lmk_metric.proto",
     "protos/perfetto/metrics/android/mem_metric.proto",
@@ -1322,8 +1320,7 @@
   out: [
     "external/perfetto/protos/perfetto/metrics/android/batt_metric.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/cpu_metric.pbzero.cc",
-    "external/perfetto/protos/perfetto/metrics/android/heap_profile.pbzero.cc",
-    "external/perfetto/protos/perfetto/metrics/android/heap_profile_frame_stats.pbzero.cc",
+    "external/perfetto/protos/perfetto/metrics/android/heap_profile_callsite_stats.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/ion_metric.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/lmk_metric.pbzero.cc",
     "external/perfetto/protos/perfetto/metrics/android/mem_metric.pbzero.cc",
@@ -1341,8 +1338,7 @@
   srcs: [
     "protos/perfetto/metrics/android/batt_metric.proto",
     "protos/perfetto/metrics/android/cpu_metric.proto",
-    "protos/perfetto/metrics/android/heap_profile.proto",
-    "protos/perfetto/metrics/android/heap_profile_frame_stats.proto",
+    "protos/perfetto/metrics/android/heap_profile_callsite_stats.proto",
     "protos/perfetto/metrics/android/ion_metric.proto",
     "protos/perfetto/metrics/android/lmk_metric.proto",
     "protos/perfetto/metrics/android/mem_metric.proto",
@@ -1360,8 +1356,7 @@
   out: [
     "external/perfetto/protos/perfetto/metrics/android/batt_metric.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/cpu_metric.pbzero.h",
-    "external/perfetto/protos/perfetto/metrics/android/heap_profile.pbzero.h",
-    "external/perfetto/protos/perfetto/metrics/android/heap_profile_frame_stats.pbzero.h",
+    "external/perfetto/protos/perfetto/metrics/android/heap_profile_callsite_stats.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/ion_metric.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/lmk_metric.pbzero.h",
     "external/perfetto/protos/perfetto/metrics/android/mem_metric.pbzero.h",