am db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev

* commit 'db733579a4c64eddd7dadb4ac15f54658ccfc0fb':
  atrace: add the 'dalvik' trace category
This commit is contained in:
Jamie Gennis 2013-05-07 18:23:18 -07:00 committed by Android Git Automerger
commit d2a92b5b97

View File

@ -81,6 +81,7 @@ static const TracingCategory k_categories[] = {
{ "camera", "Camera", ATRACE_TAG_CAMERA, { } }, { "camera", "Camera", ATRACE_TAG_CAMERA, { } },
{ "hal", "Hardware Modules", ATRACE_TAG_HAL, { } }, { "hal", "Hardware Modules", ATRACE_TAG_HAL, { } },
{ "res", "Resource Loading", ATRACE_TAG_RESOURCES, { } }, { "res", "Resource Loading", ATRACE_TAG_RESOURCES, { } },
{ "dalvik", "Dalvik VM", ATRACE_TAG_DALVIK, { } },
{ "sched", "CPU Scheduling", 0, { { "sched", "CPU Scheduling", 0, {
{ 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" },