From 6e7eea2da712d84176a59143325e9479eb4b0e53 Mon Sep 17 00:00:00 2001
From: Alexey Avramov <hakavlad@gmail.com>
Date: Sat, 16 Mar 2019 03:17:45 +0900
Subject: [PATCH] add psi_metrics

---
 nohang      | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------
 nohang.conf | 13 +++++++-----
 psi_dummy   |  2 ++
 3 files changed, 62 insertions(+), 12 deletions(-)
 create mode 100644 psi_dummy

diff --git a/nohang b/nohang
index 3cdc0b6..881bae3 100755
--- a/nohang
+++ b/nohang
@@ -211,15 +211,46 @@ def update_stat_dict_and_print(key):
 
         print(stats_msg)
 
-
+'''
 def psi_mem_some_avg_total():
     if psi_support:
         return float(rline1(psi_path).rpartition('=')[2])
+'''
 
-
+'''
 def psi_mem_some_avg10():
     if psi_support:
         return float(rline1(psi_path).split(' ')[1].split('=')[1])
+'''
+
+
+
+
+# psi_metrics = 'some_avg10'
+
+def find_psi_metrics_value(psi_path, psi_metrics):
+
+    if psi_support:
+
+        if psi_metrics == 'some_avg10':
+            return float(rline1(psi_path).split(' ')[1].split('=')[1])
+        if psi_metrics == 'some_avg60':
+            return float(rline1(psi_path).split(' ')[2].split('=')[1])
+        if psi_metrics == 'some_avg300':
+            return float(rline1(psi_path).split(' ')[3].split('=')[1])
+
+        if psi_metrics == 'full_avg10':
+            with open(psi_path) as f:
+                psi_list = f.readlines()
+                return float(psi_list[1].split(' ')[1].split('=')[1])
+        if psi_metrics == 'full_avg60':
+            with open(psi_path) as f:
+                psi_list = f.readlines()
+                return float(psi_list[1].split(' ')[2].split('=')[1])
+        if psi_metrics == 'full_avg300':
+            with open(psi_path) as f:
+                psi_list = f.readlines()
+                return float(psi_list[1].split(' ')[3].split('=')[1])
 
 
 def check_mem():
@@ -354,6 +385,15 @@ def rline1(path):
                 'utf-8', 'ignore').split('\n')[0]
 
 
+
+
+
+
+
+
+
+
+
 def kib_to_mib(num):
     """Convert KiB values to MiB values."""
     return round(num / 1024.0)
@@ -1662,7 +1702,11 @@ else:
     exit(1)
 
 
-
+if 'psi_metrics' in config_dict:
+    psi_metrics = config_dict['psi_metrics']
+else:
+    errprint('psi_metrics is not in config\nExit')
+    exit(1)
 
 
 
@@ -1939,21 +1983,22 @@ while True:
 
     if psi_support and not ignore_psi:
 
-        avg10 = psi_mem_some_avg10()
+        # avg10 = psi_mem_some_avg10()
+        avg10 = find_psi_metrics_value(psi_path, psi_metrics)
 
         if print_mem_check_results:
-            avg_value = 'PSI mem some avg10: {} | '.format(str(avg10).rjust(6))
+            avg_value = 'PSI value: {} | '.format(str(avg10).rjust(6))
 
         if avg10 >= sigkill_psi and time() - psi_t0 >= psi_avg10_sleep_time:
             time0 = time()
-            mem_info = 'avg ({}) > sigkill_psi ({})'.format(avg10, sigkill_psi)
+            mem_info = 'PSI value ({}) > sigkill_psi ({})'.format(avg10, sigkill_psi)
             implement_corrective_action(SIGKILL)
             psi_t0 = time()
             continue
 
         if avg10 >= sigterm_psi and time() - psi_t0 >= psi_avg10_sleep_time:
             time0 = time()
-            mem_info = 'avg ({}) > sigterm_psi ({})'.format(avg10, sigterm_psi)
+            mem_info = 'PSI value ({}) > sigterm_psi ({})'.format(avg10, sigterm_psi)
             implement_corrective_action(SIGTERM)
             psi_t0 = time()
             continue
diff --git a/nohang.conf b/nohang.conf
index 50306c5..90d6caa 100644
--- a/nohang.conf
+++ b/nohang.conf
@@ -62,18 +62,21 @@ zram_max_sigterm = 50 %
 zram_max_sigkill = 55 %
 
 
-    Response on PSI memory some avg10 value
+    Response on PSI memory some/full avg10/avg60/avg300 value
     (/proc/pressure/memory on systems with Linux 4.20+).
 
-ignore_psi = True
+ignore_psi = False
 
     Choose path to PSI file.
 
     psi_path = /sys/fs/cgroup/unified/user.slice/memory.pressure
     psi_path = /sys/fs/cgroup/unified/system.slice/memory.pressure
     psi_path = /sys/fs/cgroup/unified/system.slice/foo.service/memory.pressure
+    psi_path = /proc/pressure/memory
 
-psi_path = /proc/pressure/memory
+psi_path = ./psi_dummy
+
+psi_metrics = some_avg10
 
 sigterm_psi_avg10 = 60
 sigkill_psi_avg10 = 90
@@ -330,13 +333,13 @@ print_config = False
     Print memory check results.
     Valid values are True and False.
 
-print_mem_check_results = False
+print_mem_check_results = True
 
     Минимальная периодичность печати состояния памяти.
     0 - печатать все проверки памяти.
     Неотрицательное число.
 
-min_mem_report_interval = 10
+min_mem_report_interval = 1
 
     Print sleep periods between memory checks.
     Valid values are True and False.
diff --git a/psi_dummy b/psi_dummy
new file mode 100644
index 0000000..60b9136
--- /dev/null
+++ b/psi_dummy
@@ -0,0 +1,2 @@
+some avg10=29.70 avg60=51.59 avg300=22.92 total=195239452
+full avg10=28.82 avg60=49.77 avg300=21.83 total=182504463