wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lmkd: remove priority setting for the kill target am: 67c467d4ec am: 7f8da1ec36 am: 14811ac9c0 

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2241693

Change-Id: I9a56144d36393c0bc5e6df6bff5ae99551917637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Suren Baghdasaryan 2022-10-11 00:42:24 +00:00 committed by Automerger Merge Worker
parent 9d3206eebb 14811ac9c0
commit 7882afb254
1 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
reaper.cpp
View File

@ -89,6 +89,14 @@ static void* reaper_main(void* param) {
ALOGI("Process %d was reaped in %ldms", target.pid, ALOGI("Process %d was reaped in %ldms", target.pid,
get_time_diff_ms(&start_tm, &end_tm)); get_time_diff_ms(&start_tm, &end_tm));
} }
if (!SetProcessProfilesCached(target.uid, target.pid,
{"CPUSET_SP_FOREGROUND", "SCHED_SP_FOREGROUND"})) {
if (reaper->debug_enabled()) {
ALOGW("Failed to set task profiles for the process (%d) being killed", target.pid);
}
}
done: done:
close(target.pidfd); close(target.pidfd);
reaper->request_complete(); reaper->request_complete();
@ -152,41 +160,6 @@ bool Reaper::init(int comm_fd) {
return true; return true;
} }
static void set_process_group_and_prio(uid_t uid, int pid, const std::vector<std::string>& profiles,
int prio) {
DIR* d;
char proc_path[PATH_MAX];
struct dirent* de;
if (!SetProcessProfilesCached(uid, pid, profiles)) {
ALOGW("Failed to set task profiles for the process (%d) being killed", pid);
}
snprintf(proc_path, sizeof(proc_path), "/proc/%d/task", pid);
if (!(d = opendir(proc_path))) {
ALOGW("Failed to open %s; errno=%d: process pid(%d) might have died", proc_path, errno,
pid);
return;
}
while ((de = readdir(d))) {
int t_pid;
if (de->d_name[0] == '.') continue;
t_pid = atoi(de->d_name);
if (!t_pid) {
ALOGW("Failed to get t_pid for '%s' of pid(%d)", de->d_name, pid);
continue;
}
if (setpriority(PRIO_PROCESS, t_pid, prio) && errno != ESRCH) {
ALOGW("Unable to raise priority of killing t_pid (%d): errno=%d", t_pid, errno);
}
}
closedir(d);
}
bool Reaper::async_kill(const struct target_proc& target) { bool Reaper::async_kill(const struct target_proc& target) {
if (target.pidfd == -1) { if (target.pidfd == -1) {
return false; return false;
@ -210,10 +183,6 @@ bool Reaper::async_kill(const struct target_proc& target) {
cond_.notify_one(); cond_.notify_one();
mutex_.unlock(); mutex_.unlock();
set_process_group_and_prio(target.uid, target.pid,
{"CPUSET_SP_FOREGROUND", "SCHED_SP_FOREGROUND"},
ANDROID_PRIORITY_HIGHEST);
return true; return true;
} }