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

Commit aa46d590 authored by Tim Murray's avatar Tim Murray
Browse files

resolve merge conflicts of 6eee56cc to mnc-dr2-dev. 

Change-Id: I74e31430cc655e4c75d290c5fada94784b4e2cd7
parents ea7731ad 6eee56cc

libcutils/sched_policy.c

+9 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static int bg_cgroup_fd = -1; 
static int fg_cgroup_fd = -1;



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

static int system_bg_cpuset_fd = -1;

static int bg_cpuset_fd = -1;

static int fg_cpuset_fd = -1;

static int bg_schedboost_fd = -1;
@@ -128,6 +129,11 @@ static void __initialize(void) { 
        fg_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC);

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

        bg_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC);

        filename = "/dev/cpuset/system-background/tasks";

        system_bg_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC);

        if (system_bg_cpuset_fd < 0) {

            SLOGE("initialize of system-bg failed: %s\n", strerror(errno));

        }

#ifdef USE_SCHEDBOOST

        filename = "/sys/fs/cgroup/stune/foreground/tasks";

        fg_schedboost_fd = open(filename, O_WRONLY | O_CLOEXEC);
@@ -271,6 +277,9 @@ int set_cpuset_policy(int tid, SchedPolicy policy) 
        fd = fg_cpuset_fd;

        boost_fd = fg_schedboost_fd;

        break;

    case SP_SYSTEM:

        fd = system_bg_cpuset_fd;

        break;

    default:

        boost_fd = fd = -1;

        break;

rootdir/init.rc

+3 −1
Original line number Diff line number Diff line
@@ -174,6 +174,9 @@ on init 
    chown system system /dev/cpuset/foreground/boost/tasks

    chown system system /dev/cpuset/background/tasks

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



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

    chmod 0775 /dev/cpuset/system-background

    chmod 0664 /dev/cpuset/foreground/tasks

    chmod 0664 /dev/cpuset/foreground/boost/tasks

    chmod 0664 /dev/cpuset/background/tasks
@@ -652,7 +655,6 @@ service surfaceflinger /system/bin/surfaceflinger 
    user system

    group graphics drmrpc

    onrestart restart zygote

    writepid /sys/fs/cgroup/stune/foreground/tasks /dev/cpuset/system-background/tasks



service drm /system/bin/drmserver

    class main