Revert "cpu-sched: move all threads, not just the main one"

This reverts commit c18193530e5a5ad0e89902b6318f114e8432cc4c.

Change-Id: Idfe24be6476d731ccc16e41482498e16dc780399
Signed-off-by: Cho youngjae <4nuri1205@naver.com>

diff --git a/src/cpu/cpu-sched.c b/src/cpu/cpu-sched.c
index e753d3b..16332c4 100644 (file)
--- a/src/cpu/cpu-sched.c
+++ b/src/cpu/cpu-sched.c
@@ -405,64 +405,6 @@ static int cpu_sched_cpu_off(void *data)
        return RESOURCED_ERROR_NONE;
 }
 
-static int proc_pid_tasks_filter(const struct dirent *de)
-{
-       // the only entries should be dot, dotdot, and TIDs
-       return de->d_name[0] != '.';
-}
-
-static bool add_one_tid_to_node(const char *node_path, const struct dirent *de)
-{
-       int const r = fwrite_str(node_path, de->d_name);
-
-       if (r == 0) {
-               /* We're not even logging this because
-                * Tizen already has too many logs and
-                * there is no need to clutter dlog. */
-
-               // _D("tid %s moved successfully", de->d_name);
-       } else if (r == -ESRCH) {
-               /* Threads can finish while we work.
-                * This is fine (if a bit of a race
-                * condition) so we don't mind if we
-                * try to move such a goner.
-                *
-                * Note that zombies don't get added
-                * to the task list, but nevertheless
-                * they return success, not ESRCH. */
-
-               _D("tid %s: already dead (not an error)", de->d_name);
-       } else {
-               errno = -r;
-               _W("failed to move tid %s: %m\n", de->d_name);
-               return false;
-       }
-
-       return true;
-}
-
-static int cpu_sched_add_all_tids_to_cpuset_node(const char *node_path, pid_t pid)
-{
-       char proc_pid_tasks_path[sizeof "/proc/" + MAX_DEC_SIZE(pid_t) + sizeof "/task" - 1];
-       int r = snprintf(proc_pid_tasks_path, sizeof proc_pid_tasks_path, "/proc/%d/task", pid);
-       ret_value_msg_if(r < 0, RESOURCED_ERROR_FAIL, "Failed to create proc path string for pid %d: %m", pid);
-
-       struct dirent **entries;
-       int entry_count = scandir(proc_pid_tasks_path, &entries, proc_pid_tasks_filter, alphasort);
-       ret_value_msg_if(entry_count < 0, RESOURCED_ERROR_FAIL, "Couldn't read tid list for pid %d: %m", pid);
-
-       bool ok = true;
-       for (int i = 0; i < entry_count; ++i) {
-               struct dirent *const de = entries[i];
-               ok &= add_one_tid_to_node(node_path, de);
-               free(de);
-       }
-
-       free(entries);
-
-       return ok ? RESOURCED_ERROR_NONE : RESOURCED_ERROR_FAIL;
-}
-
 static int cpu_sched_add_pid_to_cpuset(struct coreset *set, pid_t pid)
 {
        assert(set);
@@ -470,11 +412,14 @@ static int cpu_sched_add_pid_to_cpuset(struct coreset *set, pid_t pid)
        _D("cpu-sched: add pid %d to cpuset %s", pid, set->name);
 
        char path[PATH_MAX];
-       int r = snprintf(path, sizeof path, CPUSET_CGROUP "/%s/tasks", set->name);
-       ret_value_msg_if(r < 0, RESOURCED_ERROR_FAIL, "cpu-sched: failed to setup path for cpuset (%s)", set->name);
+       int r = snprintf(path, sizeof path, "%s/%s", CPUSET_CGROUP, set->name);
+       if (r < 0) {
+               _E("cpu-sched: failed to setup path for cpuset (%s)", set->name);
+               return r;
+       }
 
-       r = cpu_sched_add_all_tids_to_cpuset_node(path, pid);
-       ret_value_msg_if(r != RESOURCED_ERROR_NONE, r, "Failed to attach pid %d and all its threads to cpuset %s", pid, set->name);
+       r = cgroup_write_node_int32(path, "tasks", pid);
+       ret_value_msg_if(r < 0, RESOURCED_ERROR_FAIL, "Failed to attach pid %d to cgroup %s: %m", pid, path);
 
        return RESOURCED_ERROR_NONE;
 }
@@ -485,8 +430,8 @@ static int cpu_sched_remove_pid_from_cpuset(struct coreset *set, pid_t pid)
 
        _D("cpu-sched: moving pid %d to toplevel cpuset (from %s cpuset)", pid, set->name);
 
-       int r = cpu_sched_add_all_tids_to_cpuset_node(CPUSET_CGROUP "/tasks", pid);
-       ret_value_msg_if(r != RESOURCED_ERROR_NONE, r, "Failed to attach pid %d and all its threads to top-level cpuset", pid);
+       int r = cgroup_write_node_int32(CPUSET_CGROUP, "tasks", pid);
+       ret_value_msg_if(r < 0, RESOURCED_ERROR_FAIL, "Failed to attach pid %d to cgroup " CPUSET_CGROUP ": %m", pid);
 
        return RESOURCED_ERROR_NONE;
 }