summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Riley Andrews <riandrews@google.com> 2015-11-19 22:18:01 +0000
committer android-build-merger <android-build-merger@google.com> 2015-11-19 22:18:01 +0000
commit0db38b1133ad18201c0e5c436dd33bdff787ccaf (patch)
tree15bf7321b67bce3dd2584253bc4adeb58c2b7894
parente44a02b7607661501d6f7b6956373578159f389d (diff)
parent3619cb2909cbd21cfd080fb1142fd77207cee1d8 (diff)
Merge "Add support for new sched kernel tracepoint" am: 61c9506a09 am: 31a851cd75
am: 3619cb2909 * commit '3619cb2909cbd21cfd080fb1142fd77207cee1d8': Add support for new sched kernel tracepoint
-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 8bba81b65b..0e77850096 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -96,6 +96,7 @@ static const TracingCategory k_categories[] = {
{ "sched", "CPU Scheduling", 0, {
{ REQ, "/sys/kernel/debug/tracing/events/sched/sched_switch/enable" },
{ REQ, "/sys/kernel/debug/tracing/events/sched/sched_wakeup/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/sched/sched_blocked_reason/enable" },
} },
{ "irq", "IRQ Events", 0, {
{ REQ, "/sys/kernel/debug/tracing/events/irq/enable" },
diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index cde9c37a9a..3373192749 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -12,6 +12,7 @@ on boot
chown root shell /sys/kernel/debug/tracing/options/print-tgid
chown root shell /sys/kernel/debug/tracing/events/sched/sched_switch/enable
chown root shell /sys/kernel/debug/tracing/events/sched/sched_wakeup/enable
+ chown root shell /sys/kernel/debug/tracing/events/sched/sched_blocked_reason/enable
chown root shell /sys/kernel/debug/tracing/events/power/cpu_frequency/enable
chown root shell /sys/kernel/debug/tracing/events/power/cpu_idle/enable
chown root shell /sys/kernel/debug/tracing/events/power/clock_set_rate/enable
@@ -34,6 +35,7 @@ on boot
chmod 0664 /sys/kernel/debug/tracing/options/print-tgid
chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_switch/enable
chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_wakeup/enable
+ chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_blocked_reason/enable
chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_frequency/enable
chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_idle/enable
chmod 0664 /sys/kernel/debug/tracing/events/power/clock_set_rate/enable