From f00a3947839e815c88c1e5ee09b53558d2dec336 Mon Sep 17 00:00:00 2001
From: Alexey Avramov <hakavlad@gmail.com>
Date: Fri, 12 Jun 2020 13:38:21 +0900
Subject: [PATCH] Improve output

---
 src/psi-top | 10 +++++-----
 src/psi2log | 12 +++++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/psi-top b/src/psi-top
index d0b7838..5def586 100755
--- a/src/psi-top
+++ b/src/psi-top
@@ -97,7 +97,7 @@ met = args.metrics
 
 
 if not (met == 'memory' or met == 'io' or met == 'cpu'):
-    print('Invalid metrics:', met)
+    print('ERROR: invalid metrics:', met)
     exit(1)
 
 
@@ -130,9 +130,9 @@ 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(
     met, cgroup2_mountpoint)
@@ -140,9 +140,9 @@ cgroup_v2 mountpoint: {}
 
 head_cpu = '''PSI metrics: {}
 cgroup_v2 mountpoint: {}
-----------------------------------
+=====================|
          some        |
--------------------- | -----------
+-------------------- |
  avg10  avg60 avg300 | cgroup_v2
 ------ ------ ------ | -----------'''.format(
     met, cgroup2_mountpoint)
diff --git a/src/psi2log b/src/psi2log
index 0d4e6d4..396e83c 100755
--- a/src/psi2log
+++ b/src/psi2log
@@ -286,7 +286,7 @@ def print_head_2():
     """
     """
     log('======|=============|=============|')
-    log(' cpu  |     io      |   memory    |')
+    log(' cpu  |      io     |    memory   |')
     log('----- | ----------- | ----------- |')
     log(' some |  some  full |  some  full | interval')
     log('----- | ----- ----- | ----- ----- | --------')
@@ -412,9 +412,15 @@ else:
     logstring = 'log file is not set, '
 
 
+if interval < 0.1:
+    log_head('error: argument -i/--interval: the value must be greater than or'
+             ' equal to 0.1')
+    exit(1)
+
+
 log_head('Starting psi2log, target: {}, mode: {}, interval: {} sec, {}suppress'
          ' output: {}'.format(
-             target, mode, interval, logstring, suppress_output))
+             target, mode, round(interval, 3), logstring, suppress_output))
 
 
 fd = dict()
@@ -540,7 +546,7 @@ if mode == '2':
             round(avg_ms, 1),
             round(avg_mf, 1),
 
-            round(dm, 3)
+            round(dm, 2)
 
         ))