Skip to content

Commit

Permalink
tools/kvm_stat: add new interactive command 'o'
Browse files Browse the repository at this point in the history
Add new interactive command 'o' to toggle sorting by 'CurAvg/s' (default)
and 'Total' columns.

Signed-off-by: Stefan Raspl <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
  • Loading branch information
Stefan Raspl authored and bonzini committed Jun 8, 2017
1 parent 64eefad commit 6667ae8
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
17 changes: 16 additions & 1 deletion tools/kvm/kvm_stat/kvm_stat
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,7 @@ DELAY_DEFAULT = 3.0
MAX_GUEST_NAME_LEN = 48
MAX_REGEX_LEN = 44
DEFAULT_REGEX = r'^[^\(]*$'
SORT_DEFAULT = 0


class Tui(object):
Expand All @@ -857,6 +858,7 @@ class Tui(object):
self.screen = None
self._delay_initial = 0.25
self._delay_regular = DELAY_DEFAULT
self._sorting = SORT_DEFAULT

def __enter__(self):
"""Initialises curses for later use. Based on curses.wrapper
Expand Down Expand Up @@ -994,14 +996,23 @@ class Tui(object):
self.screen.clrtobot()
stats = self.stats.get()

def sortkey(x):
def sortCurAvg(x):
# sort by current events if available
if stats[x][1]:
return (-stats[x][1], -stats[x][0])
else:
return (0, -stats[x][0])

def sortTotal(x):
# sort by totals
return (0, -stats[x][0])
total = 0.
for val in stats.values():
total += val[0]
if self._sorting == SORT_DEFAULT:
sortkey = sortCurAvg
else:
sortkey = sortTotal
for key in sorted(stats.keys(), key=sortkey):

if row >= self.screen.getmaxyx()[0]:
Expand All @@ -1025,6 +1036,7 @@ class Tui(object):
' f filter by regular expression',
' g filter by guest name',
' h display interactive commands reference',
' o toggle sorting order (Total vs CurAvg/s)',
' p filter by PID',
' q quit',
' r reset stats',
Expand Down Expand Up @@ -1215,6 +1227,8 @@ class Tui(object):
sleeptime = self._delay_initial
if char == 'h':
self.show_help_interactive()
if char == 'o':
self._sorting = not self._sorting
if char == 'p':
curses.curs_set(1)
self.show_vm_selection_by_pid()
Expand Down Expand Up @@ -1302,6 +1316,7 @@ Interactive Commands:
f filter by regular expression
g filter by guest name
h display interactive commands reference
o toggle sorting order (Total vs CurAvg/s)
p filter by PID
q quit
r reset stats
Expand Down
2 changes: 2 additions & 0 deletions tools/kvm/kvm_stat/kvm_stat.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ INTERACTIVE COMMANDS

*h*:: display interactive commands reference

*o*:: toggle sorting order (Total vs CurAvg/s)

*p*:: filter by PID

*q*:: quit
Expand Down

0 comments on commit 6667ae8

Please sign in to comment.