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

Commit e734ba4f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4731145 from 658ae90f to pi-release 

Change-Id: I790589a416dcc523e1ef15e35cb4ddcd33e9975d
parents f6f40056 658ae90f

libcutils/include/cutils/sched_policy.h

+8 −7
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ typedef enum { 
    SP_AUDIO_SYS = 4,

    SP_TOP_APP = 5,

    SP_RT_APP = 6,

    SP_RESTRICTED = 7,

    SP_CNT,

    SP_MAX = SP_CNT - 1,

    SP_SYSTEM_DEFAULT = SP_FOREGROUND,

libcutils/sched_policy.cpp

+10 −8
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ static int system_bg_cpuset_fd = -1; 
static int bg_cpuset_fd = -1;

static int fg_cpuset_fd = -1;

static int ta_cpuset_fd = -1; // special cpuset for top app

static int rs_cpuset_fd = -1;  // special cpuset for screen off restrictions



// File descriptors open to /dev/stune/../tasks, setup by initialize, or -1 on error

static int bg_schedboost_fd = -1;
@@ -151,6 +152,8 @@ static void __initialize() { 
            system_bg_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC);

            filename = "/dev/cpuset/top-app/tasks";

            ta_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC);

            filename = "/dev/cpuset/restricted/tasks";

            rs_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC);



            if (schedboost_enabled()) {

                filename = "/dev/stune/top-app/tasks";
@@ -308,6 +311,9 @@ int set_cpuset_policy(int tid, SchedPolicy policy) 
    case SP_SYSTEM:

        fd = system_bg_cpuset_fd;

        break;

    case SP_RESTRICTED:

        fd = rs_cpuset_fd;

        break;

    default:

        boost_fd = fd = -1;

        break;
@@ -458,13 +464,9 @@ const char *get_sched_policy_name(SchedPolicy policy) 
{

    policy = _policy(policy);

    static const char* const strings[SP_CNT] = {

       [SP_BACKGROUND] = "bg",

       [SP_FOREGROUND] = "fg",

       [SP_SYSTEM]     = "  ",

       [SP_AUDIO_APP]  = "aa",

       [SP_AUDIO_SYS]  = "as",

       [SP_TOP_APP]    = "ta",

       [SP_RT_APP]    = "rt",

            [SP_BACKGROUND] = "bg", [SP_FOREGROUND] = "fg", [SP_SYSTEM] = "  ",

            [SP_AUDIO_APP] = "aa",  [SP_AUDIO_SYS] = "as",  [SP_TOP_APP] = "ta",

            [SP_RT_APP] = "rt",     [SP_RESTRICTED] = "rs",

    };

    if ((policy < SP_CNT) && (strings[policy] != NULL))

        return strings[policy];

rootdir/init.rc

+9 −0
Original line number Diff line number Diff line
@@ -176,6 +176,12 @@ on init 
    copy /dev/cpuset/cpus /dev/cpuset/system-background/cpus

    copy /dev/cpuset/mems /dev/cpuset/system-background/mems



    # restricted is for system tasks that are being throttled

    # due to screen off.

    mkdir /dev/cpuset/restricted

    copy /dev/cpuset/cpus /dev/cpuset/restricted/cpus

    copy /dev/cpuset/mems /dev/cpuset/restricted/mems



    mkdir /dev/cpuset/top-app

    copy /dev/cpuset/cpus /dev/cpuset/top-app/cpus

    copy /dev/cpuset/mems /dev/cpuset/top-app/mems
@@ -186,11 +192,13 @@ on init 
    chown system system /dev/cpuset/background

    chown system system /dev/cpuset/system-background

    chown system system /dev/cpuset/top-app

    chown system system /dev/cpuset/restricted

    chown system system /dev/cpuset/tasks

    chown system system /dev/cpuset/foreground/tasks

    chown system system /dev/cpuset/background/tasks

    chown system system /dev/cpuset/system-background/tasks

    chown system system /dev/cpuset/top-app/tasks

    chown system system /dev/cpuset/restricted/tasks



    # set system-background to 0775 so SurfaceFlinger can touch it

    chmod 0775 /dev/cpuset/system-background
@@ -199,6 +207,7 @@ on init 
    chmod 0664 /dev/cpuset/background/tasks

    chmod 0664 /dev/cpuset/system-background/tasks

    chmod 0664 /dev/cpuset/top-app/tasks

    chmod 0664 /dev/cpuset/restricted/tasks

    chmod 0664 /dev/cpuset/tasks