Commit 38e89c37 authored by Stefan Raspl's avatar Stefan Raspl Committed by Paolo Bonzini

tools/kvm_stat: rename 'Current' column to 'CurAvg/s'

'Current' can be misleading as it doesn't tell whether this is the amount
of events in the last interval or the current average per second.
Note that this necessitates widening the respective column by one more
character.
Signed-off-by: default avatarStefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f6d75310
...@@ -981,8 +981,8 @@ class Tui(object): ...@@ -981,8 +981,8 @@ class Tui(object):
if len(regex) > MAX_REGEX_LEN: if len(regex) > MAX_REGEX_LEN:
regex = regex[:MAX_REGEX_LEN] + '...' regex = regex[:MAX_REGEX_LEN] + '...'
self.screen.addstr(1, 17, 'regex filter: {0}'.format(regex)) self.screen.addstr(1, 17, 'regex filter: {0}'.format(regex))
self.screen.addstr(2, 1, '%-40s %10s%7s %7s' % self.screen.addstr(2, 1, '%-40s %10s%7s %8s' %
('Event', 'Total', '%Total', 'Current'), ('Event', 'Total', '%Total', 'CurAvg/s'),
curses.A_STANDOUT) curses.A_STANDOUT)
self.screen.addstr(4, 1, 'Collecting data...') self.screen.addstr(4, 1, 'Collecting data...')
self.screen.refresh() self.screen.refresh()
...@@ -1010,7 +1010,7 @@ class Tui(object): ...@@ -1010,7 +1010,7 @@ class Tui(object):
break break
if values[0] is not None: if values[0] is not None:
cur = int(round(values[1] / sleeptime)) if values[1] else '' cur = int(round(values[1] / sleeptime)) if values[1] else ''
self.screen.addstr(row, 1, '%-40s %10d%7.1f %7s' % self.screen.addstr(row, 1, '%-40s %10d%7.1f %8s' %
(key, values[0], values[0] * 100 / total, (key, values[0], values[0] * 100 / total,
cur)) cur))
row += 1 row += 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment