From 39677bb7f68a7f73671ad1de1180d1a6cd775218 Mon Sep 17 00:00:00 2001 From: Alexey Avramov Date: Sun, 10 Jun 2018 00:01:39 +0900 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nohang | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/nohang b/nohang index 4d11665..a176f42 100755 --- a/nohang +++ b/nohang @@ -5,12 +5,11 @@ import os from ctypes import CDLL from operator import itemgetter -from signal import SIGKILL, SIGTERM -from time import gmtime, strftime, sleep, time -import argparse +from time import sleep +from argparse import ArgumentParser -parser = argparse.ArgumentParser() +parser = ArgumentParser() parser.add_argument( '-c', '--config', @@ -151,8 +150,7 @@ def pid_to_name(pid): return '' -# поиск пид жертвы И ПОСЫЛ СИГНАЛА -def find_victim(signal): +def find_victim_and_send_signal(signal): if decrease_oom_score_adj_enable and root: decrease_oom_score_adj(oom_score_adj_before, oom_score_adj_after) @@ -513,7 +511,7 @@ while True: kib_to_mib(swap_min_sigkill_kb) ) ) - find_victim(SIGKILL) + find_victim_and_send_signal(9) sleep(min_delay_after_sigkill) continue @@ -525,7 +523,7 @@ while True: kib_to_mib(zram_max_sigkill_kb) ) ) - find_victim(SIGKILL) + find_victim_and_send_signal(9) sleep(min_delay_after_sigkill) continue @@ -539,7 +537,7 @@ while True: kib_to_mib(swap_min_sigterm_kb) ) ) - find_victim(SIGTERM) + find_victim_and_send_signal(15) sleep(min_delay_after_sigterm) # MEM ZRAM TERM @@ -550,7 +548,7 @@ while True: kib_to_mib(zram_max_sigterm_kb) ) ) - find_victim(SIGTERM) + find_victim_and_send_signal(15) sleep(min_delay_after_sigterm) sleep(t)