summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorColin Cross <ccross@google.com>2014-08-19 01:48:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-19 01:48:59 +0000
commit7477a8a0a31f5fd7d5bf34596d7a717df60842ce (patch)
tree17fd62e00b0815605c689cac7e55f85244682df4 /cmds
parent5a7ad73bd2a8be38bc3c92c532ddeb1b50b1af3f (diff)
parentb1f0f288e30c0448cabd46d19c60b3bd0d272f74 (diff)
downloadframeworks_native-7477a8a0a31f5fd7d5bf34596d7a717df60842ce.zip
frameworks_native-7477a8a0a31f5fd7d5bf34596d7a717df60842ce.tar.gz
frameworks_native-7477a8a0a31f5fd7d5bf34596d7a717df60842ce.tar.bz2
am b1f0f288: Merge changes I4cfb3138,I45356c29 into lmp-dev
* commit 'b1f0f288e30c0448cabd46d19c60b3bd0d272f74': atrace: add memory reclaim tracing atrace: Add IRQ events
Diffstat (limited to 'cmds')
-rw-r--r--cmds/atrace/atrace.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index f124caf..fb40193 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -92,6 +92,9 @@ static const TracingCategory k_categories[] = {
{ REQ, "/sys/kernel/debug/tracing/events/sched/sched_switch/enable" },
{ REQ, "/sys/kernel/debug/tracing/events/sched/sched_wakeup/enable" },
} },
+ { "irq", "IRQ Events", 0, {
+ { REQ, "/sys/kernel/debug/tracing/events/irq/enable" },
+ } },
{ "freq", "CPU Frequency", 0, {
{ REQ, "/sys/kernel/debug/tracing/events/power/cpu_frequency/enable" },
{ OPT, "/sys/kernel/debug/tracing/events/power/clock_set_rate/enable" },
@@ -126,6 +129,12 @@ static const TracingCategory k_categories[] = {
{ "workq", "Kernel Workqueues", 0, {
{ REQ, "/sys/kernel/debug/tracing/events/workqueue/enable" },
} },
+ { "memreclaim", "Kernel Memory Reclaim", 0, {
+ { REQ, "/sys/kernel/debug/tracing/events/vmscan/mm_vmscan_direct_reclaim_begin/enable" },
+ { REQ, "/sys/kernel/debug/tracing/events/vmscan/mm_vmscan_direct_reclaim_end/enable" },
+ { REQ, "/sys/kernel/debug/tracing/events/vmscan/mm_vmscan_kswapd_wake/enable" },
+ { REQ, "/sys/kernel/debug/tracing/events/vmscan/mm_vmscan_kswapd_sleep/enable" },
+ } },
};
/* Command line options */