commit 2fb7f559cfe58d7ed735ed0cd3e613261f2e5d05
author Carmen Jackson <carmenjackson@google.com> Fri Oct 19 00:14:40 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 19 00:14:40 2018 -0700
tree 85e536bcebe52cdcee4aa995d0aff2784f4e3c91
parent 7d2bc002612ecc9de746d5a6ebaac68193ebda2a
parent 6f6719826d49765e6300096f9dcfbd6fead8264d

Merge "Add Memory category to atrace." am: 09a8db1080
am: 6f6719826d

Change-Id: I5a067900e560c3a1b205741a34b9cef19857af5a

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index e897482..19c2830 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -224,6 +224,11 @@
     { "pagecache",  "Page cache", 0, {
         { REQ,      "events/filemap/enable" },
     } },
+    { "memory",  "Memory", 0, {
+        { OPT,      "events/kmem/rss_stat/enable" },
+        { OPT,      "events/kmem/ion_heap_grow/enable" },
+        { OPT,      "events/kmem/ion_heap_shrink/enable" },
+    } },
 };
 
 struct TracingVendorCategory {