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

fix find victim

Browse Source
This commit is contained in:
Alexey Avramov 2019-02-10 04:49:45 +09:00
parent e6d442f9e9
commit 98f1c52b43
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nohang
View File

@ -20,7 +20,7 @@ if self_uid == 0:
else: else:
root = False root = False
wait_time = 3 wait_time = 12
# todo: make config option # todo: make config option
max_sleep_time = 2 max_sleep_time = 2
@ -488,11 +488,6 @@ def sleep_after_send_signal(signal):
sleep(min_delay_after_sigterm) sleep(min_delay_after_sigterm)
def get_pid_list(): def get_pid_list():
""" """
Find pid list expect kthreads and zombies Find pid list expect kthreads and zombies
@ -504,7 +499,6 @@ def get_pid_list():
return pid_list return pid_list
pid_list = get_pid_list() pid_list = get_pid_list()
def get_non_decimal_pids(): def get_non_decimal_pids():
@ -515,10 +509,6 @@ def get_non_decimal_pids():
return non_decimal_list return non_decimal_list
#print(get_non_decimal_pids())
def fattest(): def fattest():
""" """
Find the process with highest badness and its badness adjustment Find the process with highest badness and its badness adjustment
@ -557,16 +547,10 @@ def fattest():
name = pid_to_name(pid) name = pid_to_name(pid)
for re_tup in processname_re_list: for re_tup in processname_re_list:
if search(re_tup[1], name) is not None: if search(re_tup[1], name) is not None:
if pid_to_cmdline(pid) == '':
# skip kthreads
continue
badness += int(re_tup[0]) badness += int(re_tup[0])
if re_match_cmdline: if re_match_cmdline:
cmdline = pid_to_cmdline(pid) cmdline = pid_to_cmdline(pid)
if cmdline == '':
# skip kthreads
continue
for re_tup in cmdline_re_list: for re_tup in cmdline_re_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 += int(re_tup[0])
@ -575,12 +559,8 @@ def fattest():
uid = pid_to_uid(pid) uid = pid_to_uid(pid)
for re_tup in uid_re_list: for re_tup in uid_re_list:
if search(re_tup[1], uid) is not None: if search(re_tup[1], uid) is not None:
if pid_to_cmdline(pid) == '':
# skip kthreads
continue
badness += int(re_tup[0]) badness += int(re_tup[0])
except FileNotFoundError: except FileNotFoundError:
continue continue
except ProcessLookupError: except ProcessLookupError:
@ -600,9 +580,6 @@ def fattest():
# Get maximum 'badness' value # Get maximum 'badness' value
victim_badness = pid_tuple_list[1] victim_badness = pid_tuple_list[1]
#print(pid_badness_list)
return pid, victim_badness return pid, victim_badness