diff options
| author | Colin Cross <ccross@google.com> | 2014-08-19 01:26:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-16 04:32:18 +0000 |
| commit | b1f0f288e30c0448cabd46d19c60b3bd0d272f74 (patch) | |
| tree | 18559597e125db9c5b67bd85e892117ae378d8be | |
| parent | 62fbb16383d6d8268821f947e2c6d0828f7e2b41 (diff) | |
| parent | 580407f1075fe97d7466724f71cc03816b7404fe (diff) | |
| download | frameworks_native-b1f0f288e30c0448cabd46d19c60b3bd0d272f74.zip frameworks_native-b1f0f288e30c0448cabd46d19c60b3bd0d272f74.tar.gz frameworks_native-b1f0f288e30c0448cabd46d19c60b3bd0d272f74.tar.bz2 | |
Merge changes I4cfb3138,I45356c29 into lmp-dev
* changes:
atrace: add memory reclaim tracing
atrace: Add IRQ events
| -rw-r--r-- | cmds/atrace/atrace.cpp | 9 |
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 */ |