am b1f0f288: Merge changes I4cfb3138,I45356c29 into lmp-dev

* commit 'b1f0f288e30c0448cabd46d19c60b3bd0d272f74':
  atrace: add memory reclaim tracing
  atrace: Add IRQ events
This commit is contained in:
Colin Cross 2014-08-19 01:48:59 +00:00 committed by Android Git Automerger
commit 7477a8a0a3

View File

@ -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_switch/enable" },
{ REQ, "/sys/kernel/debug/tracing/events/sched/sched_wakeup/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, { { "freq", "CPU Frequency", 0, {
{ REQ, "/sys/kernel/debug/tracing/events/power/cpu_frequency/enable" }, { REQ, "/sys/kernel/debug/tracing/events/power/cpu_frequency/enable" },
{ OPT, "/sys/kernel/debug/tracing/events/power/clock_set_rate/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, { { "workq", "Kernel Workqueues", 0, {
{ REQ, "/sys/kernel/debug/tracing/events/workqueue/enable" }, { 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 */ /* Command line options */