summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-04-24 10:15:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-04-24 10:15:01 +0000
commit97ffec4e1fa344452cf563da8e77ed56e16cda4b (patch)
treea927dc6e6bc8c00f5413528a4d47a802d628ce72
parente8b30f3f7a33e0a5926eea313ba669b6bbd26521 (diff)
parent02984beb6b97e0a4bd44ba46272bd7739f2cd58f (diff)
Merge "Add ion/ion_stat to the atrace memory category" am: 1a4d480a77 am: bccee21178 am: d116904056 am: 02984beb6b
Change-Id: I273341a60900a6b2fdebcb0bae19c40a526b8b9f
-rw-r--r--cmds/atrace/atrace.cpp1
-rw-r--r--cmds/atrace/atrace.rc2
2 files changed, 3 insertions, 0 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 8637a31a5e..28fdaa4306 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -237,6 +237,7 @@ static const TracingCategory k_categories[] = {
{ OPT, "events/kmem/rss_stat/enable" },
{ OPT, "events/kmem/ion_heap_grow/enable" },
{ OPT, "events/kmem/ion_heap_shrink/enable" },
+ { OPT, "events/ion/ion_stat/enable" },
} },
};
diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index 040dddeb12..9b2f4a8861 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -107,6 +107,8 @@ on late-init
chmod 0666 /sys/kernel/tracing/events/kmem/ion_heap_grow/enable
chmod 0666 /sys/kernel/debug/tracing/events/kmem/ion_heap_shrink/enable
chmod 0666 /sys/kernel/tracing/events/kmem/ion_heap_shrink/enable
+ chmod 0666 /sys/kernel/debug/tracing/events/ion/ion_stat/enable
+ chmod 0666 /sys/kernel/tracing/events/ion/ion_stat/enable
chmod 0666 /sys/kernel/debug/tracing/events/mm_event/mm_event_record/enable
chmod 0666 /sys/kernel/tracing/events/mm_event/mm_event_record/enable
chmod 0666 /sys/kernel/debug/tracing/events/signal/signal_generate/enable