diff options
| author | Carmen Jackson <carmenjackson@google.com> | 2019-05-08 15:11:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-08 15:11:57 -0700 |
| commit | dd912213428a7ef15a37e1ec321e41acac10c92b (patch) | |
| tree | d6e82f315757135e040f6331469b02528f671f88 | |
| parent | be492884021d5881a7995c93dc86e58c4e9a9b8c (diff) | |
| parent | 7aaa254814c6857acecb37ce93d3b3e55c8c8d98 (diff) | |
| download | native-temp_b_131756210_stage-aosp-master.tar.gz | |
Merge "Move basic events into the sched category in atrace."temp_b_131756210_stage-aosp-master
am: 7aaa254814
Change-Id: I9bf1ceadb8bfbb9bfa843e8d3354a1e65d3750b4
| -rw-r--r-- | cmds/atrace/atrace.cpp | 10 | ||||
| -rw-r--r-- | cmds/atrace/atrace.rc | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp index d276696964..443f885f40 100644 --- a/cmds/atrace/atrace.cpp +++ b/cmds/atrace/atrace.cpp @@ -62,7 +62,7 @@ using hardware::atrace::V1_0::toString; using std::string; -#define MAX_SYS_FILES 10 +#define MAX_SYS_FILES 11 const char* k_traceTagsProperty = "debug.atrace.tags.enableflags"; const char* k_userInitiatedTraceProperty = "debug.atrace.user_initiated"; @@ -132,7 +132,11 @@ static const TracingCategory k_categories[] = { { OPT, "events/sched/sched_blocked_reason/enable" }, { OPT, "events/sched/sched_cpu_hotplug/enable" }, { OPT, "events/sched/sched_pi_setprio/enable" }, + { OPT, "events/sched/sched_process_exit/enable" }, { OPT, "events/cgroup/enable" }, + { OPT, "events/oom/oom_score_adj_update/enable" }, + { OPT, "events/task/task_rename/enable" }, + { OPT, "events/task/task_newtask/enable" }, } }, { "irq", "IRQ Events", 0, { { REQ, "events/irq/enable" }, @@ -230,10 +234,6 @@ static const TracingCategory k_categories[] = { { OPT, "events/kmem/rss_stat/enable" }, { OPT, "events/kmem/ion_heap_grow/enable" }, { OPT, "events/kmem/ion_heap_shrink/enable" }, - { OPT, "events/oom/oom_score_adj_update/enable" }, - { OPT, "events/sched/sched_process_exit/enable" }, - { OPT, "events/task/task_rename/enable" }, - { OPT, "events/task/task_newtask/enable" }, } }, }; diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc index 66c9cc6148..aed3e14822 100644 --- a/cmds/atrace/atrace.rc +++ b/cmds/atrace/atrace.rc @@ -33,6 +33,8 @@ on late-init chmod 0666 /sys/kernel/tracing/events/sched/sched_cpu_hotplug/enable chmod 0666 /sys/kernel/debug/tracing/events/sched/sched_pi_setprio/enable chmod 0666 /sys/kernel/tracing/events/sched/sched_pi_setprio/enable + chmod 0666 /sys/kernel/debug/tracing/events/sched/sched_process_exit/enable + chmod 0666 /sys/kernel/tracing/events/sched/sched_process_exit/enable chmod 0666 /sys/kernel/debug/tracing/events/cgroup/enable chmod 0666 /sys/kernel/tracing/events/cgroup/enable chmod 0666 /sys/kernel/debug/tracing/events/power/cpu_frequency/enable |