am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."

* commit '259c25080d8b7f3b66e27e4d8ac3a268738ebe3f':
  Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
This commit is contained in:
Elliott Hughes 2014-05-29 01:04:28 +00:00 committed by Android Git Automerger
commit e77cb9317d

View File

@ -84,6 +84,7 @@ static const TracingCategory k_categories[] = {
{ "res", "Resource Loading", ATRACE_TAG_RESOURCES, { } }, { "res", "Resource Loading", ATRACE_TAG_RESOURCES, { } },
{ "dalvik", "Dalvik VM", ATRACE_TAG_DALVIK, { } }, { "dalvik", "Dalvik VM", ATRACE_TAG_DALVIK, { } },
{ "rs", "RenderScript", ATRACE_TAG_RS, { } }, { "rs", "RenderScript", ATRACE_TAG_RS, { } },
{ "bionic", "Bionic C Library", ATRACE_TAG_BIONIC, { } },
{ "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" },