Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 420fe120 authored by Ioannis Ilkos's avatar Ioannis Ilkos Committed by Automerger Merge Worker
Browse files

Merge "Add suspend_resume_minimal synthetic ftrace event" am: 95390150 am:... 

Merge "Add suspend_resume_minimal synthetic ftrace event" am: 95390150 am: 98c7d71d am: 5ab20aec am: 1b612445 am: 143cb2bb

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2524155



Change-Id: Ibdf0ff5666b221e438394f2603f071f95e665cd0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 259e9d7a 143cb2bb

cmds/atrace/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -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",

}

cmds/atrace/atrace.rc

+11 −5
Original line number Diff line number Diff line
@@ -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

cmds/atrace/ftrace_synthetic_events.conf

0 → 100644
+2 −0
Original line number Diff line number Diff line 
rss_stat_throttled unsigned int mm_id; unsigned int curr; int member; long size

suspend_resume_minimal bool start