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-01-10 23:49:52 +09:00
parent f63cd1c8fc
commit b2f101621d
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nohang
View File

@ -605,11 +605,20 @@ def find_victim_and_send_signal(signal):
'Shmem: \033[33m{}\033[0m MiB)' \ 'Shmem: \033[33m{}\033[0m MiB)' \
'\n VmSwap: \033[33m{}\033[0m MiB' \ '\n VmSwap: \033[33m{}\033[0m MiB' \
'\n CmdLine: \033[33m{}\033[0m'.format( '\n CmdLine: \033[33m{}\033[0m'.format(
name, pid, uid, name,
victim_badness, oom_score, oom_score_adj, pid,
vm_size, str(vm_rss).rjust(len_vm, ' '), uid,
anon_rss, file_rss, shmem_rss, victim_badness,
str(vm_swap).rjust(len_vm, ' '), cmdline) oom_score,
oom_score_adj,
vm_size,
str(vm_rss).rjust(len_vm),
anon_rss,
file_rss,
shmem_rss,
str(vm_swap).rjust(len_vm),
cmdline
)
else: else:
victim_info = '\033[4mFound a victim with highest badness:\033[0m' \ victim_info = '\033[4mFound a victim with highest badness:\033[0m' \
'\n Name: \033[33m{}\033[0m' \ '\n Name: \033[33m{}\033[0m' \
@ -622,9 +631,17 @@ def find_victim_and_send_signal(signal):
'\n VmRSS: \033[33m{}\033[0m MiB' \ '\n VmRSS: \033[33m{}\033[0m MiB' \
'\n VmSwap: \033[33m{}\033[0m MiB' \ '\n VmSwap: \033[33m{}\033[0m MiB' \
'\n CmdLine: \033[33m{}\033[0m'.format( '\n CmdLine: \033[33m{}\033[0m'.format(
name, pid, uid, victim_badness, vm_size, name,
str(vm_rss).rjust(len_vm, ' '), pid,
str(vm_swap).rjust(len_vm, ' '), cmdline) uid,
victim_badness,
oom_score,
oom_score_adj,
vm_size,
str(vm_rss).rjust(len_vm),
str(vm_swap).rjust(len_vm),
cmdline
)
if execute_the_command and signal is SIGTERM and name in etc_dict: if execute_the_command and signal is SIGTERM and name in etc_dict:
command = etc_dict[name] command = etc_dict[name]