github/nohang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't increase badness if oom_score_adj < 0 #64

Browse Source
This commit is contained in:
Alexey Avramov 2019-12-15 01:42:54 +09:00
parent 795dd13474
commit 860958497a
1 changed files with 73 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
nohang/nohang
View File

@ -867,8 +867,8 @@ def pid_to_uid(pid):
def pid_to_badness(pid): def pid_to_badness(pid):
"""Find and modify badness (if it needs).""" """Find and modify badness (if it needs)."""
oom_score_adj = None
try: try:
oom_score = int(rline1('/proc/' + pid + '/oom_score')) oom_score = int(rline1('/proc/' + pid + '/oom_score'))
badness = oom_score badness = oom_score
@ -881,49 +881,113 @@ def pid_to_badness(pid):
name = pid_to_name(pid) name = pid_to_name(pid)
for re_tup in badness_adj_re_name_list: for re_tup in badness_adj_re_name_list:
if search(re_tup[1], name) is not None: if search(re_tup[1], name) is not None:
badness += int(re_tup[0]) badness_adj = int(re_tup[0])
if badness_adj <= 0:
badness += badness_adj
else:
if oom_score_adj is None:
oom_score_adj = int(rline1(
'/proc/' + pid + '/oom_score_adj'))
if oom_score_adj >= 0:
badness += badness_adj
if re_match_cgroup_v1: if re_match_cgroup_v1:
cgroup_v1 = pid_to_cgroup_v1(pid) cgroup_v1 = pid_to_cgroup_v1(pid)
for re_tup in badness_adj_re_cgroup_v1_list: for re_tup in badness_adj_re_cgroup_v1_list:
if search(re_tup[1], cgroup_v1) is not None: if search(re_tup[1], cgroup_v1) is not None:
badness += int(re_tup[0]) badness_adj = int(re_tup[0])
if badness_adj <= 0:
badness += badness_adj
else:
if oom_score_adj is None:
oom_score_adj = int(rline1(
'/proc/' + pid + '/oom_score_adj'))
if oom_score_adj >= 0:
badness += badness_adj
if re_match_cgroup_v2: if re_match_cgroup_v2:
cgroup_v2 = pid_to_cgroup_v2(pid) cgroup_v2 = pid_to_cgroup_v2(pid)
for re_tup in badness_adj_re_cgroup_v2_list: for re_tup in badness_adj_re_cgroup_v2_list:
if search(re_tup[1], cgroup_v2) is not None: if search(re_tup[1], cgroup_v2) is not None:
badness += int(re_tup[0]) badness_adj = int(re_tup[0])
if badness_adj <= 0:
badness += badness_adj
else:
if oom_score_adj is None:
oom_score_adj = int(rline1(
'/proc/' + pid + '/oom_score_adj'))
if oom_score_adj >= 0:
badness += badness_adj
if re_match_realpath: if re_match_realpath:
realpath = pid_to_realpath(pid) realpath = pid_to_realpath(pid)
for re_tup in badness_adj_re_realpath_list: for re_tup in badness_adj_re_realpath_list:
if search(re_tup[1], realpath) is not None: if search(re_tup[1], realpath) is not None:
badness += int(re_tup[0]) badness_adj = int(re_tup[0])
if badness_adj <= 0:
badness += badness_adj
else:
if oom_score_adj is None:
oom_score_adj = int(rline1(
'/proc/' + pid + '/oom_score_adj'))
if oom_score_adj >= 0:
badness += badness_adj
if re_match_cwd: if re_match_cwd:
cwd = pid_to_cwd(pid) cwd = pid_to_cwd(pid)
for re_tup in badness_adj_re_cwd_list: for re_tup in badness_adj_re_cwd_list:
if search(re_tup[1], cwd) is not None: if search(re_tup[1], cwd) is not None:
badness += int(re_tup[0]) badness_adj = int(re_tup[0])
if badness_adj <= 0:
badness += badness_adj
else:
if oom_score_adj is None:
oom_score_adj = int(rline1(
'/proc/' + pid + '/oom_score_adj'))
if oom_score_adj >= 0:
badness += badness_adj
if re_match_cmdline: if re_match_cmdline:
cmdline = pid_to_cmdline(pid) cmdline = pid_to_cmdline(pid)
for re_tup in badness_adj_re_cmdline_list: for re_tup in badness_adj_re_cmdline_list:
if search(re_tup[1], cmdline) is not None: if search(re_tup[1], cmdline) is not None:
badness += int(re_tup[0]) badness_adj = int(re_tup[0])
if badness_adj <= 0:
badness += badness_adj
else:
if oom_score_adj is None:
oom_score_adj = int(rline1(
'/proc/' + pid + '/oom_score_adj'))
if oom_score_adj >= 0:
badness += badness_adj
if re_match_environ: if re_match_environ:
environ = pid_to_environ(pid) environ = pid_to_environ(pid)
for re_tup in badness_adj_re_environ_list: for re_tup in badness_adj_re_environ_list:
if search(re_tup[1], environ) is not None: if search(re_tup[1], environ) is not None:
badness += int(re_tup[0]) badness_adj = int(re_tup[0])
if badness_adj <= 0:
badness += badness_adj
else:
if oom_score_adj is None:
oom_score_adj = int(rline1(
'/proc/' + pid + '/oom_score_adj'))
if oom_score_adj >= 0:
badness += badness_adj
if re_match_uid: if re_match_uid:
uid = pid_to_uid(pid) uid = pid_to_uid(pid)
for re_tup in badness_adj_re_uid_list: for re_tup in badness_adj_re_uid_list:
if search(re_tup[1], uid) is not None: if search(re_tup[1], uid) is not None:
badness += int(re_tup[0]) badness_adj = int(re_tup[0])
if badness_adj <= 0:
badness += badness_adj
else:
if oom_score_adj is None:
oom_score_adj = int(rline1(
'/proc/' + pid + '/oom_score_adj'))
if oom_score_adj >= 0:
badness += badness_adj
if forbid_negative_badness: if forbid_negative_badness:
if badness < 0: if badness < 0: