From b2f101621dc9fbfff32e7659670effa532049d7e Mon Sep 17 00:00:00 2001 From: Alexey Avramov Date: Thu, 10 Jan 2019 23:49:52 +0900 Subject: [PATCH] fix find_victim --- nohang | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/nohang b/nohang index 9a68b62..6200775 100755 --- a/nohang +++ b/nohang @@ -605,11 +605,20 @@ def find_victim_and_send_signal(signal): 'Shmem: \033[33m{}\033[0m MiB)' \ '\n VmSwap: \033[33m{}\033[0m MiB' \ '\n CmdLine: \033[33m{}\033[0m'.format( - name, pid, uid, - victim_badness, 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) + name, + pid, + uid, + victim_badness, + 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: victim_info = '\033[4mFound a victim with highest badness:\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 VmSwap: \033[33m{}\033[0m MiB' \ '\n CmdLine: \033[33m{}\033[0m'.format( - name, pid, uid, victim_badness, vm_size, - str(vm_rss).rjust(len_vm, ' '), - str(vm_swap).rjust(len_vm, ' '), cmdline) + name, + pid, + 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: command = etc_dict[name]