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

Commit b9091d64 authored by Ryan Savitski's avatar Ryan Savitski Committed by Automerger Merge Worker
Browse files

Merge "Update aosp atrace.rc to fix throttled_rss_stat on user builds" am:... 

Merge "Update aosp atrace.rc to fix throttled_rss_stat on user builds" am: 756d6d9d am: 78339cc3

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



Change-Id: I61b4acb15fc0eb69877934a21f91252dcc02b53a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f9c891b 78339cc3

cmds/atrace/atrace.rc

+20 −1
Original line number Diff line number Diff line
@@ -181,6 +181,8 @@ on late-init 
    chmod 0666 /sys/kernel/tracing/events/clk/clk_enable/enable

    chmod 0666 /sys/kernel/debug/tracing/events/clk/clk_set_rate/enable

    chmod 0666 /sys/kernel/tracing/events/clk/clk_set_rate/enable

    chmod 0666 /sys/kernel/debug/tracing/events/printk/console/enable

    chmod 0666 /sys/kernel/tracing/events/printk/console/enable



    # disk

    chmod 0666 /sys/kernel/tracing/events/f2fs/f2fs_get_data_block/enable
@@ -295,8 +297,18 @@ on late-init 
    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

    chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/trigger

    chmod 0666 /sys/kernel/tracing/events/kmem/rss_stat/trigger

    chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/trigger



    # allow enabling rss_stat_throttled

    chmod 0666 /sys/kernel/tracing/events/synthetic/rss_stat_throttled/enable

    chmod 0666 /sys/kernel/debug/tracing/events/synthetic/rss_stat_throttled/enable



on late-init && property:ro.boot.fastboot.boottrace=enabled

    setprop debug.atrace.tags.enableflags 802922

    setprop persist.traced.enable 0

    write /sys/kernel/debug/tracing/tracing_on 1

    write /sys/kernel/tracing/tracing_on 1



# Only create the tracing instance if persist.mm_events.enabled

# Attempting to remove the tracing instance after it has been created
@@ -393,3 +405,10 @@ on property:persist.debug.atrace.boottrace=1 
service boottrace /system/bin/atrace --async_start -f /data/misc/boottrace/categories

    disabled

    oneshot



on property:sys.boot_completed=1 && property:ro.boot.fastboot.boottrace=enabled

    setprop debug.atrace.tags.enableflags 0

    setprop persist.traced.enable 1

    write /sys/kernel/debug/tracing/tracing_on 0

    write /sys/kernel/tracing/tracing_on 0