commit 235545c5bfb36a962bf5b8410a8a010f1ae795e2
author Ioannis Ilkos <ilkos@google.com> Tue May 07 14:39:01 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 07 14:39:01 2019 +0000
tree 9ff42981a50ab6329e175dbab181628407cc6247
parent b0119a63642efa978ca366c287476932a7c865f6
parent d4efb70bdb96f9b27d2e99411915c106d6c921c9

Merge "Correct ion values"

src/trace_processor/proto_trace_parser.cc

diff --git a/src/trace_processor/proto_trace_parser.cc b/src/trace_processor/proto_trace_parser.cc
index 5cf13a9..50bd57f 100644
--- a/src/trace_processor/proto_trace_parser.cc
+++ b/src/trace_processor/proto_trace_parser.cc
@@ -669,8 +669,10 @@
                                                 ConstBytes blob,
                                                 bool grow) {
   protos::pbzero::IonHeapGrowFtraceEvent::Decoder ion(blob.data, blob.size);
-  int64_t total_bytes = ion.total_allocated();
   int64_t change_bytes = static_cast<int64_t>(ion.len()) * (grow ? 1 : -1);
+  // The total_allocated ftrace event reports the value before the
+  // atomic_long_add / sub takes place.
+  int64_t total_bytes = ion.total_allocated() + change_bytes;
   StringId global_name_id = ion_total_unknown_id_;
   StringId change_name_id = ion_change_unknown_id_;