commit b770955a7d3aafcd374e0da4968391b59083cf39
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 21 22:09:50 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 21 22:09:51 2017 +0000
tree 67367713677de96373370c060a84f6689290672e
parent a1025b4fe472412a8a0221328577f7c6ea375a9d
parent d8236097dad88e9d98482d91753241cd967d81cc

Merge changes from topic 'remove_bg_cgroup'

* changes:
  libcutils: only change cgroup when fd is initialized
  init.rc: remove bg_non_interactive cgroup

libcutils/sched_policy.cpp

diff --git a/libcutils/sched_policy.cpp b/libcutils/sched_policy.cpp
index 7e3ad59..40144cf 100644
--- a/libcutils/sched_policy.cpp
+++ b/libcutils/sched_policy.cpp
@@ -464,7 +464,7 @@
             break;
         }
 
-        if (add_tid_to_cgroup(tid, fd) != 0) {
+        if (fd > 0 && add_tid_to_cgroup(tid, fd) != 0) {
             if (errno != ESRCH && errno != ENOENT)
                 return -errno;
         }

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 25cea7f..dcb3b25 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -150,15 +150,6 @@
     write /dev/cpuctl/cpu.rt_period_us 1000000
     write /dev/cpuctl/cpu.rt_runtime_us 950000
 
-    mkdir /dev/cpuctl/bg_non_interactive
-    chown system system /dev/cpuctl/bg_non_interactive/tasks
-    chmod 0666 /dev/cpuctl/bg_non_interactive/tasks
-    # 5.0 %
-    write /dev/cpuctl/bg_non_interactive/cpu.shares 52
-    write /dev/cpuctl/bg_non_interactive/cpu.rt_period_us 1000000
-    # active FIFO threads will never be in BG
-    write /dev/cpuctl/bg_non_interactive/cpu.rt_runtime_us 10000
-
     # sets up initial cpusets for ActivityManager
     mkdir /dev/cpuset
     mount cpuset none /dev/cpuset