diff options
| author | Jamie Gennis <jgennis@google.com> | 2013-05-08 15:03:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-08 15:03:56 -0700 |
| commit | 7f9efade0d37566600a64ff2e80531270fdfdb3d (patch) | |
| tree | f752503db96002d575667c2792ce10a175fe3886 | |
| parent | dc1b01141f9063af6f8b67bfebd8325da1216c1f (diff) | |
| parent | d2a92b5b97b5a107d327744f216abdea8e0cda89 (diff) | |
| download | frameworks_native-7f9efade0d37566600a64ff2e80531270fdfdb3d.zip frameworks_native-7f9efade0d37566600a64ff2e80531270fdfdb3d.tar.gz frameworks_native-7f9efade0d37566600a64ff2e80531270fdfdb3d.tar.bz2 | |
am d2a92b5b: am db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev
* commit 'd2a92b5b97b5a107d327744f216abdea8e0cda89':
atrace: add the 'dalvik' trace category
| -rw-r--r-- | cmds/atrace/atrace.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp index 06e9744..1911839 100644 --- a/cmds/atrace/atrace.cpp +++ b/cmds/atrace/atrace.cpp @@ -81,6 +81,7 @@ static const TracingCategory k_categories[] = { { "camera", "Camera", ATRACE_TAG_CAMERA, { } }, { "hal", "Hardware Modules", ATRACE_TAG_HAL, { } }, { "res", "Resource Loading", ATRACE_TAG_RESOURCES, { } }, + { "dalvik", "Dalvik VM", ATRACE_TAG_DALVIK, { } }, { "sched", "CPU Scheduling", 0, { { REQ, "/sys/kernel/debug/tracing/events/sched/sched_switch/enable" }, { REQ, "/sys/kernel/debug/tracing/events/sched/sched_wakeup/enable" }, |