tools/kvm_stat: add '%Total' column

Add column '%Total' next to 'Total' for easier comparison of numbers between
hosts.

Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
This commit is contained in:
Stefan Raspl 2017-03-10 13:40:16 +01:00 committed by Paolo Bonzini
parent 9f114a03c6
commit e55fe3cccc

View File

@ -973,7 +973,9 @@ class Tui(object):
self.screen.addstr(2, 1, 'Event') self.screen.addstr(2, 1, 'Event')
self.screen.addstr(2, 1 + LABEL_WIDTH + NUMBER_WIDTH - self.screen.addstr(2, 1 + LABEL_WIDTH + NUMBER_WIDTH -
len('Total'), 'Total') len('Total'), 'Total')
self.screen.addstr(2, 1 + LABEL_WIDTH + NUMBER_WIDTH + 8 - self.screen.addstr(2, 1 + LABEL_WIDTH + NUMBER_WIDTH + 7 -
len('%Total'), '%Total')
self.screen.addstr(2, 1 + LABEL_WIDTH + NUMBER_WIDTH + 7 + 8 -
len('Current'), 'Current') len('Current'), 'Current')
self.screen.addstr(4, 1, 'Collecting data...') self.screen.addstr(4, 1, 'Collecting data...')
self.screen.refresh() self.screen.refresh()
@ -989,6 +991,9 @@ class Tui(object):
return (-stats[x][1], -stats[x][0]) return (-stats[x][1], -stats[x][0])
else: else:
return (0, -stats[x][0]) return (0, -stats[x][0])
total = 0.
for val in stats.values():
total += val[0]
for key in sorted(stats.keys(), key=sortkey): for key in sorted(stats.keys(), key=sortkey):
if row >= self.screen.getmaxyx()[0]: if row >= self.screen.getmaxyx()[0]:
@ -1001,6 +1006,8 @@ class Tui(object):
col += LABEL_WIDTH col += LABEL_WIDTH
self.screen.addstr(row, col, '%10d' % (values[0],)) self.screen.addstr(row, col, '%10d' % (values[0],))
col += NUMBER_WIDTH col += NUMBER_WIDTH
self.screen.addstr(row, col, '%7.1f' % (values[0] * 100 / total,))
col += 7
if values[1] is not None: if values[1] is not None:
self.screen.addstr(row, col, '%8d' % (values[1] / sleeptime,)) self.screen.addstr(row, col, '%8d' % (values[1] / sleeptime,))
row += 1 row += 1