From 1af45a5b343def545ca0e280d502695494d65898 Mon Sep 17 00:00:00 2001 From: Alexey Avramov Date: Mon, 31 Dec 2018 04:23:44 +0900 Subject: [PATCH] fix PSI support --- nohang | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/nohang b/nohang index 1438e46..5a03852 100755 --- a/nohang +++ b/nohang @@ -1565,12 +1565,21 @@ psi_support = os.path.exists('/proc/pressure/memory') while True: + if psi_support: - print(psi_mem_some_avg10()) - if psi_mem_some_avg10() >= sigkill_psi: + + avg10 = psi_mem_some_avg10() + + if avg10 >= sigkill_psi: + time0 = time() + mem_info = 'avg10 > sigkill_avg10' find_victim_and_send_signal(SIGKILL) - if psi_mem_some_avg10() >= sigterm_psi: + elif avg10 >= sigterm_psi: + time0 = time() + mem_info = 'avg10 > sigterm_avg10' find_victim_and_send_signal(SIGTERM) + else: + print('PSI memory avg10:', avg10) mem_available, swap_total, swap_free = check_mem_and_swap() @@ -1736,17 +1745,3 @@ while True: - - - - - - - - - - - - - -