commit 9eeff809b2410ff5373609d08d8d2510875b38fb
author Ioannis Ilkos <ilkos@google.com> Tue Apr 04 23:04:50 2023 +0000
committer Ioannis Ilkos <ilkos@google.com> Wed Apr 05 12:57:32 2023 +0000
tree 03b2f68336664e933e8112cf9f4345f908948a38
parent be2ac15ceaad1e2f03abeb84d4346fcb2445cf38

Add suspend_resume_minimal synthetic ftrace event

Also had to move the synthetic event definition to its own file. This is
because init write does not open the file for append, and therefore only
the first write to trace/synthetic_events works.

Bug: 277016923
Test: manual
Change-Id: I7178985f63cb48505ab3e876d8886f3a30ee533c

cmds/atrace/atrace.rc

diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index 07e586e..6469e95 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -291,12 +291,10 @@
 # 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 @@
     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