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

fix

Browse Source
This commit is contained in:
Alexey Avramov 2019-04-03 13:10:02 +09:00
parent 60f3d0c2bd
commit f1128f5c8f
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nohang
View File

@ -683,7 +683,6 @@ def send_notify_warn():
notify_send_wait(title, body) notify_send_wait(title, body)
''' '''
# os.system('echo --- \ - $(sleep 5) - ')
print('Warning threshold exceeded') print('Warning threshold exceeded')
@ -693,10 +692,12 @@ def send_notify_warn():
else: else:
title = 'Low memory' title = 'Low memory'
body = 'MemAvail: {}%\nSwapFree: {}%'.format( body = 'MemAvail: {}%\nSwapFree: {}%'.format(
round(mem_available / mem_total * 100), round(mem_available / mem_total * 100),
round(swap_free / (swap_total + 0.1) * 100) round(swap_free / (swap_total + 0.1) * 100)
) )
send_notification(title, body) send_notification(title, body)
@ -708,6 +709,12 @@ def send_notify(signal, name, pid):
name: str process name name: str process name
pid: str process pid pid: str process pid
""" """
# wait for memory release after corrective action
# may be useful if free memory was about 0 immediately after
# corrective action
sleep(0.01)
title = 'Freeze prevention' title = 'Freeze prevention'
body = '<b>{}</b> [{}] <b>{}</b>'.format( body = '<b>{}</b> [{}] <b>{}</b>'.format(
notify_sig_dict[signal], notify_sig_dict[signal],
@ -721,15 +728,6 @@ def send_notify(signal, name, pid):
send_notification(title, body) send_notification(title, body)
'''
if root:
# send notification to all active users with notify-send
notify_helper(title, body)
else:
# send notification to user that runs this nohang
notify_send_wait(title, body)
'''
def send_notify_etc(pid, name, command): def send_notify_etc(pid, name, command):
""" """
@ -746,15 +744,6 @@ def send_notify_etc(pid, name, command):
send_notification(title, body) send_notification(title, body)
'''
if root:
# send notification to all active users with notify-send
notify_helper(title, body)
else:
# send notification to user that runs this nohang
notify_send_wait(title, body)
'''
def send_notification(title, body): def send_notification(title, body):
""" """
@ -1248,8 +1237,8 @@ def implement_corrective_action(signal):
# todo: make new func # todo: make new func
m = check_mem_and_swap() m = check_mem_and_swap()
ma = round(int(m[0]) / 1024.0) ma = round(int(m[0]) / 1024.0, 1)
sf = round(int(m[2]) / 1024.0) sf = round(int(m[2]) / 1024.0, 1)
log('Memory status before implementing a corrective act' log('Memory status before implementing a corrective act'
'ion:\n MemAvailable' 'ion:\n MemAvailable'
': {} MiB, SwapFree: {} MiB'.format(ma, sf)) ': {} MiB, SwapFree: {} MiB'.format(ma, sf))