try to fix psi-top

Makefile

@@ -10,12 +10,14 @@ install:
 
 	install -d $(DESTDIR)/$(PREFIX)/usr/bin
 	install -m0755 ./oom-sort $(DESTDIR)/$(PREFIX)/usr/bin/oom-sort
+	install -m0755 ./psi-top $(DESTDIR)/$(PREFIX)/usr/bin/psi-top
+	install -m0755 ./psi-monitor $(DESTDIR)/$(PREFIX)/usr/bin/psi-monitor
 
 	install -d $(DESTDIR)/$(PREFIX)/etc/nohang
 	-git describe --tags --long --dirty > ./version
 	-install -m0644 ./version $(DESTDIR)/$(PREFIX)/etc/nohang/version
 	-rm -fvr ./version
-	
+
 	install -m0644 ./nohang.conf $(DESTDIR)/$(PREFIX)/etc/nohang/nohang.conf
 	install -m0644 ./nohang.conf $(DESTDIR)/$(PREFIX)/etc/nohang/nohang.conf.default
 
@@ -36,6 +38,8 @@ uninstall:
 	rm -fv $(PREFIX)/usr/sbin/nohang
 	rm -fv $(PREFIX)/usr/sbin/nohang_notify_helper
 	rm -fv $(PREFIX)/usr/bin/oom-sort
+	rm -fv $(PREFIX)/usr/bin/psi-top
+	rm -fv $(PREFIX)/usr/bin/psi-monitor
 	rm -fv $(PREFIX)/usr/share/man/man1/nohang.1.gz
 	rm -fv $(PREFIX)/usr/share/man/man1/oom-sort.1.gz
 	rm -fv $(PREFIX)/lib/systemd/system/nohang.service

psi-monitor

@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+
+from ctypes import CDLL
+from time import sleep
+from sys import argv
+
+"""
+    Execute the command
+    find /sys/fs/cgroup -name memory.pressure
+    to find available memory.pressue files (except /proc/pressure/memory).
+    (actual for cgroup2)
+"""
+
+if len(argv) > 1:
+    psi_path = argv[1]
+else:
+    psi_path = '/proc/pressure/memory'
+
+
+def mlockall():
+
+    MCL_CURRENT = 1
+    MCL_FUTURE = 2
+    MCL_ONFAULT = 4
+
+    libc = CDLL('libc.so.6', use_errno=True)
+
+    result = libc.mlockall(
+        MCL_CURRENT | MCL_FUTURE | MCL_ONFAULT
+    )
+    if result != 0:
+        result = libc.mlockall(
+            MCL_CURRENT | MCL_FUTURE
+        )
+        if result != 0:
+            print('WARNING: cannot lock all memory')
+        else:
+            pass
+    else:
+        pass
+
+
+mlockall()
+
+
+def psi_path_to_metrics(psi_path):
+
+    with open(psi_path) as f:
+        psi_list = f.readlines()
+    # print(psi_list)
+    some_list, full_list = psi_list[0].split(' '), psi_list[1].split(' ')
+    #print(some_list, full_list)
+    some_avg10 = some_list[1].split('=')[1]
+    some_avg60 = some_list[2].split('=')[1]
+    some_avg300 = some_list[3].split('=')[1]
+
+    full_avg10 = full_list[1].split('=')[1]
+    full_avg60 = full_list[2].split('=')[1]
+    full_avg300 = full_list[3].split('=')[1]
+
+    return (some_avg10, some_avg60, some_avg300,
+            full_avg10, full_avg60, full_avg300)
+
+
+print('Path to PSI file: {}\n'.format(psi_path))
+
+
+print('      avg10  avg60 avg300         avg10  avg60 avg300')
+
+while True:
+    (some_avg10, some_avg60, some_avg300,
+     full_avg10, full_avg60, full_avg300) = psi_path_to_metrics(psi_path)
+
+    print('some {} {} {} | full {} {} {}'.format(
+        some_avg10.rjust(6),
+        some_avg60.rjust(6),
+        some_avg300.rjust(6),
+        full_avg10.rjust(6),
+        full_avg60.rjust(6),
+        full_avg300.rjust(6)))
+
+    sleep(2)

psi-top

@@ -0,0 +1,133 @@
+#!/usr/bin/env python3
+
+from ctypes import CDLL
+from time import sleep, time
+import os
+
+"""
+    Execute the command
+    find /sys/fs/cgroup -name memory.pressure
+    to find available memory.pressue files (except /proc/pressure/memory).
+    (actual for cgroup2)
+"""
+
+psi_path = '/proc/pressure/memory'
+
+def mlockall():
+
+    MCL_CURRENT = 1
+    MCL_FUTURE = 2
+    MCL_ONFAULT = 4
+
+    libc = CDLL('libc.so.6', use_errno=True)
+
+    result = libc.mlockall(
+        MCL_CURRENT | MCL_FUTURE | MCL_ONFAULT
+    )
+    if result != 0:
+        result = libc.mlockall(
+            MCL_CURRENT | MCL_FUTURE
+        )
+        if result != 0:
+            print('WARNING: cannot lock all memory')
+        else:
+            pass
+    else:
+        pass
+
+
+mlockall()
+
+t0 = time()
+
+def psi_path_to_metrics(psi_path):
+
+    with open(psi_path) as f:
+        psi_list = f.readlines()
+    # print(psi_list)
+    some_list, full_list = psi_list[0].split(' '), psi_list[1].split(' ')
+    #print(some_list, full_list)
+    some_avg10 = some_list[1].split('=')[1]
+    some_avg60 = some_list[2].split('=')[1]
+    some_avg300 = some_list[3].split('=')[1]
+
+    full_avg10 = full_list[1].split('=')[1]
+    full_avg60 = full_list[2].split('=')[1]
+    full_avg300 = full_list[3].split('=')[1]
+
+    return (some_avg10, some_avg60, some_avg300,
+            full_avg10, full_avg60, full_avg300)
+
+
+
+def cgroup2_root():
+    """
+    """
+    with open('/proc/mounts') as f:
+        for line in f:
+            if ' cgroup2 ' in line:
+            # if line.startswith('cgroup2 '):
+                return line[7:].rpartition(' cgroup2 ')[0].strip()
+
+
+def get_psi_mem_files(cgroup2_path):
+    """
+    """
+
+    path_list = []
+
+    for root, dirs, files in os.walk(cgroup2_path):
+        for file in files:
+            path = os.path.join(root, file)
+            if path.endswith('/memory.pressure'):
+                path_list.append(path)
+
+    return path_list
+
+
+def psi_path_to_cgroup2(path):
+    """
+    """
+    return path.partition(i)[2][:-16]
+
+
+i = cgroup2_root()
+
+print('cgroup2 root dir:', i)
+if i is not None:
+    y = get_psi_mem_files(i)
+    for path in y:
+        pass # print(psi_path_to_cgroup2(path))
+
+path_list = get_psi_mem_files(i)
+
+print('      avg10  avg60 avg300         avg10  avg60 avg300  cgroup2')
+
+print('      -----  ----- ------         -----  ----- ------  ---------')
+
+(some_avg10, some_avg60, some_avg300, full_avg10, full_avg60, full_avg300) = psi_path_to_metrics('/proc/pressure/memory')
+print('some {} {} {} | full {} {} {}  {}'.format(
+    some_avg10.rjust(6),
+    some_avg60.rjust(6),
+    some_avg300.rjust(6),
+    full_avg10.rjust(6),
+    full_avg60.rjust(6),
+    full_avg300.rjust(6), '[SYSTEM]'))
+
+
+for psi_path in path_list:
+    (some_avg10, some_avg60, some_avg300,
+     full_avg10, full_avg60, full_avg300) = psi_path_to_metrics(psi_path)
+
+    print('some {} {} {} | full {} {} {}  {}'.format(
+        some_avg10.rjust(6),
+        some_avg60.rjust(6),
+        some_avg300.rjust(6),
+        full_avg10.rjust(6),
+        full_avg60.rjust(6),
+        full_avg300.rjust(6), psi_path_to_cgroup2(psi_path)))
+
+
+print(time() - t0)
+
+