diff options
| -rw-r--r-- | cmds/atrace/Android.bp | 6 | ||||
| -rw-r--r-- | cmds/atrace/atrace.rc | 16 | ||||
| -rw-r--r-- | cmds/atrace/ftrace_synthetic_events.conf | 2 |
3 files changed, 19 insertions, 5 deletions
diff --git a/cmds/atrace/Android.bp b/cmds/atrace/Android.bp index aa0ef253bf..1c4e63e323 100644 --- a/cmds/atrace/Android.bp +++ b/cmds/atrace/Android.bp @@ -38,6 +38,7 @@ cc_binary { ], init_rc: ["atrace.rc"], + required: ["ftrace_synthetic_events.conf"], product_variables: { debuggable: { @@ -45,3 +46,8 @@ cc_binary { }, }, } + +prebuilt_etc { + name: "ftrace_synthetic_events.conf", + src: "ftrace_synthetic_events.conf", +} diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc index e66cc412f0..92b16775e7 100644 --- a/cmds/atrace/atrace.rc +++ b/cmds/atrace/atrace.rc @@ -291,12 +291,10 @@ on late-init # Setup synthetic events chmod 0666 /sys/kernel/tracing/synthetic_events chmod 0666 /sys/kernel/debug/tracing/synthetic_events + copy /system/etc/ftrace_synthetic_events.conf /sys/kernel/tracing/synthetic_events + copy /system/etc/ftrace_synthetic_events.conf /sys/kernel/debug/tracing/synthetic_events - # rss_stat_throttled - write /sys/kernel/tracing/synthetic_events "rss_stat_throttled unsigned int mm_id; unsigned int curr; int member; long size" - write /sys/kernel/debug/tracing/synthetic_events "rss_stat_throttled unsigned int mm_id; unsigned int curr; int member; long size" - - # allow creating event triggers + # allow creating rss_stat event triggers chmod 0666 /sys/kernel/tracing/events/kmem/rss_stat/trigger chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/trigger @@ -304,6 +302,14 @@ on late-init chmod 0666 /sys/kernel/tracing/events/synthetic/rss_stat_throttled/enable chmod 0666 /sys/kernel/debug/tracing/events/synthetic/rss_stat_throttled/enable + # allow creating suspend_resume triggers + chmod 0666 /sys/kernel/tracing/events/power/suspend_resume/trigger + chmod 0666 /sys/kernel/debug/tracing/events/power/suspend_resume/trigger + + # allow enabling suspend_resume_minimal + chmod 0666 /sys/kernel/tracing/events/synthetic/suspend_resume_minimal/enable + chmod 0666 /sys/kernel/debug/tracing/events/synthetic/suspend_resume_minimal/enable + on late-init && property:ro.boot.fastboot.boottrace=enabled setprop debug.atrace.tags.enableflags 802922 setprop persist.traced.enable 0 diff --git a/cmds/atrace/ftrace_synthetic_events.conf b/cmds/atrace/ftrace_synthetic_events.conf new file mode 100644 index 0000000000..e2257fe3da --- /dev/null +++ b/cmds/atrace/ftrace_synthetic_events.conf @@ -0,0 +1,2 @@ +rss_stat_throttled unsigned int mm_id; unsigned int curr; int member; long size +suspend_resume_minimal bool start |