github/nohang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix psi-top and psi2log output

Browse Source
This commit is contained in:
Alexey Avramov 2020-02-23 04:25:54 +09:00
parent 8cc7c63f9c
commit e707e37042
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/psi-top
View File

@ -130,21 +130,21 @@ path_list = get_psi_mem_files(cgroup2_mountpoint, met)
head_mem_io = '''PSI metrics: {} head_mem_io = '''PSI metrics: {}
cgroup_v2 mountpoint: {} cgroup_v2 mountpoint: {}
--------------------------------------------- ---------------------------------------------------------
some | full | some | full |
---------------------|--------------------- | --------- -------------------- | -------------------- | -----------
avg10 avg60 avg300 | avg10 avg60 avg300 | cgroup_v2 avg10 avg60 avg300 | avg10 avg60 avg300 | cgroup_v2
----- ----- ------ | ----- ----- ------ | ---------'''.format( ------ ------ ------ | ------ ------ ------ | -----------'''.format(
met, cgroup2_mountpoint) met, cgroup2_mountpoint)
head_cpu = '''PSI metrics: {} head_cpu = '''PSI metrics: {}
cgroup_v2 mountpoint: {} cgroup_v2 mountpoint: {}
---------------------- ----------------------------------
some | some |
---------------------| -------------------- | -----------
avg10 avg60 avg300 | cgroup_v2 avg10 avg60 avg300 | cgroup_v2
----- ----- ------ | ---------'''.format( ------ ------ ------ | -----------'''.format(
met, cgroup2_mountpoint) met, cgroup2_mountpoint)
@ -162,7 +162,7 @@ if met == 'cpu':
some_avg10.rjust(6), some_avg10.rjust(6),
some_avg60.rjust(6), some_avg60.rjust(6),
some_avg300.rjust(6), some_avg300.rjust(6),
'[SYSTEM_WIDE]')) 'SYSTEM_WIDE'))
else: else:
@ -175,7 +175,7 @@ else:
some_avg300.rjust(6), some_avg300.rjust(6),
full_avg10.rjust(6), full_avg10.rjust(6),
full_avg60.rjust(6), full_avg60.rjust(6),
full_avg300.rjust(6), '[SYSTEM_WIDE]')) full_avg300.rjust(6), 'SYSTEM_WIDE'))
for psi_path in path_list: for psi_path in path_list:

5
tools/psi2log
View File

@ -30,6 +30,7 @@ def signal_handler(signum, frame):
if lpd != 15: if lpd != 15:
exit() exit()
log('=================================')
log('Peak values: avg10 avg60 avg300') log('Peak values: avg10 avg60 avg300')
log('----------- ------ ------ ------') log('----------- ------ ------ ------')
@ -234,8 +235,8 @@ log('======================================================================'
'============================================') '============================================')
log(' some cpu pressure || some memory pressure | full memory pressure ||' log(' some cpu pressure || some memory pressure | full memory pressure ||'
' some io pressure | full io pressure') ' some io pressure | full io pressure')
log('---------------------||----------------------|----------------------||' log('-------------------- || -------------------- | -------------------- ||'
'----------------------|---------------------') ' -------------------- | --------------------')
log(' avg10 avg60 avg300 || avg10 avg60 avg300 | avg10 avg60 avg300 ||' log(' avg10 avg60 avg300 || avg10 avg60 avg300 | avg10 avg60 avg300 ||'
' avg10 avg60 avg300 | avg10 avg60 avg300') ' avg10 avg60 avg300 | avg10 avg60 avg300')
log('------ ------ ------ || ------ ------ ------ | ------ ------ ------ ||' log('------ ------ ------ || ------ ------ ------ | ------ ------ ------ ||'