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

Commit 355cedba authored by Carmen Jackson's avatar Carmen Jackson Committed by android-build-merger
Browse files

Merge "Move basic events into the sched category in atrace." into qt-dev 

am: a7004b29

Change-Id: I1c8578ee794ed0e324f346db156de1f7e35b42fb
parents 95028777 a7004b29

cmds/atrace/atrace.cpp

+5 −5
Original line number Diff line number Diff line
@@ -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";
@@ -133,7 +133,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" },
@@ -231,10 +235,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" },

    } },

};

cmds/atrace/atrace.rc

+2 −0
Original line number Diff line number Diff line
@@ -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/sched/sched_waking/enable

    chmod 0666 /sys/kernel/tracing/events/sched/sched_waking/enable

    chmod 0666 /sys/kernel/debug/tracing/events/cgroup/enable