fix find_victim

This commit is contained in:
Alexey Avramov 2019-01-11 00:16:30 +09:00
parent b2f101621d
commit 8d5730f6b1

15
nohang
View File

@ -571,22 +571,21 @@ def find_victim_and_send_signal(signal):
break break
with open('/proc/' + pid + '/cmdline') as file: with open('/proc/' + pid + '/cmdline') as file:
try:
cmdline = file.readlines()[0].replace('\x00', ' ') cmdline = file.readlines()[0].replace('\x00', ' ')
except IndexError:
cmdline = '' oom_score = rline1('/proc/' + pid + '/oom_score')
oom_score_adj = rline1('/proc/' + pid + '/oom_score_adj')
except FileNotFoundError: except FileNotFoundError:
pass oom_score = 'unknown'
oom_score_adj = 'unknown'
except ProcessLookupError: except ProcessLookupError:
pass pass
except IndexError: except IndexError:
pass cmdline = ''
except ValueError: except ValueError:
pass pass
# тут может быть FileNotFoundError!
oom_score = rline1('/proc/' + pid + '/oom_score')
oom_score_adj = rline1('/proc/' + pid + '/oom_score_adj')
len_vm = len(str(vm_size)) len_vm = len(str(vm_size))