From e707e370426d4e0f43da91d0e85838fa8aa5aaa6 Mon Sep 17 00:00:00 2001
From: Alexey Avramov <hakavlad@gmail.com>
Date: Sun, 23 Feb 2020 04:25:54 +0900
Subject: [PATCH] fix psi-top and psi2log output

---
 tools/psi-top | 16 ++++++++--------
 tools/psi2log |  7 ++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tools/psi-top b/tools/psi-top
index 81f6812..d0b7838 100755
--- a/tools/psi-top
+++ b/tools/psi-top
@@ -130,21 +130,21 @@ path_list = get_psi_mem_files(cgroup2_mountpoint, met)
 
 head_mem_io = '''PSI metrics: {}
 cgroup_v2 mountpoint: {}
----------------------------------------------
+---------------------------------------------------------
          some        |          full        |
----------------------|--------------------- | ---------
+-------------------- | -------------------- | -----------
  avg10  avg60 avg300 |  avg10  avg60 avg300 | cgroup_v2
- -----  ----- ------ |  -----  ----- ------ | ---------'''.format(
+------ ------ ------ | ------ ------ ------ | -----------'''.format(
     met, cgroup2_mountpoint)
 
 
 head_cpu = '''PSI metrics: {}
 cgroup_v2 mountpoint: {}
-----------------------
+----------------------------------
          some        |
----------------------|
+-------------------- | -----------
  avg10  avg60 avg300 | cgroup_v2
- -----  ----- ------ | ---------'''.format(
+------ ------ ------ | -----------'''.format(
     met, cgroup2_mountpoint)
 
 
@@ -162,7 +162,7 @@ if met == 'cpu':
         some_avg10.rjust(6),
         some_avg60.rjust(6),
         some_avg300.rjust(6),
-        '[SYSTEM_WIDE]'))
+        'SYSTEM_WIDE'))
 
 else:
 
@@ -175,7 +175,7 @@ else:
         some_avg300.rjust(6),
         full_avg10.rjust(6),
         full_avg60.rjust(6),
-        full_avg300.rjust(6), '[SYSTEM_WIDE]'))
+        full_avg300.rjust(6), 'SYSTEM_WIDE'))
 
 
 for psi_path in path_list:
diff --git a/tools/psi2log b/tools/psi2log
index e41d75e..8c2b897 100755
--- a/tools/psi2log
+++ b/tools/psi2log
@@ -30,6 +30,7 @@ def signal_handler(signum, frame):
     if lpd != 15:
         exit()
 
+    log('=================================')
     log('Peak values:  avg10  avg60 avg300')
 
     log('-----------  ------ ------ ------')
@@ -233,9 +234,9 @@ mlockall()
 log('======================================================================'
     '============================================')
 log(' some cpu pressure   || some memory pressure | full memory pressure ||'
-    '  some io pressure    |  full io pressure')
-log('---------------------||----------------------|----------------------||'
-    '----------------------|---------------------')
+    '   some io pressure   |   full io pressure')
+log('-------------------- || -------------------- | -------------------- ||'
+    ' -------------------- | --------------------')
 log(' avg10  avg60 avg300 ||  avg10  avg60 avg300 |  avg10  avg60 avg300 ||'
     '  avg10  avg60 avg300 |  avg10  avg60 avg300')
 log('------ ------ ------ || ------ ------ ------ | ------ ------ ------ ||'