summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Collin Fijalkovich <cfijalkovich@google.com> 2020-04-07 19:30:46 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-04-07 19:30:46 +0000
commit5e614328d7da6608eee181549102bae745bc25b7 (patch)
tree5ffb7cc5e60afc247480eebd0b164a7ef12172ac
parentfcf9aeceb7e5ea2142f347e7575c649cd291768d (diff)
parent65bc2aef5e6b3f4f155c03c9e0ec038f161fbc80 (diff)
Merge "Add mm_event trace events to the atrace 'memory' category" into rvc-dev
-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 544e26c666..8637a31a5e 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -233,6 +233,7 @@ static const TracingCategory k_categories[] = {
{ REQ, "events/filemap/enable" },
} },
{ "memory", "Memory", 0, {
+ { OPT, "events/mm_event/mm_event_record/enable" },
{ OPT, "events/kmem/rss_stat/enable" },
{ OPT, "events/kmem/ion_heap_grow/enable" },
{ OPT, "events/kmem/ion_heap_shrink/enable" },
diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index 6e460a0d2e..040dddeb12 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/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
chmod 0666 /sys/kernel/tracing/events/signal/signal_generate/enable
chmod 0666 /sys/kernel/debug/tracing/events/signal/signal_deliver/enable