Skip to content

Commit

Permalink
tools/kvm_stat: add '-f help' to get the available event list
Browse files Browse the repository at this point in the history
Signed-off-by: Lin Ma <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
  • Loading branch information
morecache authored and bonzini committed Jul 26, 2017
1 parent efcb521 commit 67fbcd6
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions tools/kvm/kvm_stat/kvm_stat
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ class Provider(object):
@staticmethod
def is_field_wanted(fields_filter, field):
"""Indicate whether field is valid according to fields_filter."""
if not fields_filter:
if not fields_filter or fields_filter == "help":
return True
return re.match(fields_filter, field) is not None

Expand Down Expand Up @@ -1496,7 +1496,8 @@ Press any other key to refresh statistics immediately.
action='store',
default=DEFAULT_REGEX,
dest='fields',
help='fields to display (regex)',
help='''fields to display (regex)
"-f help" for a list of available events''',
)
optparser.add_option('-p', '--pid',
action='store',
Expand Down Expand Up @@ -1559,6 +1560,17 @@ def main():

stats = Stats(options)

if options.fields == "help":
event_list = "\n"
s = stats.get()
for key in s.keys():
if key.find('(') != -1:
key = key[0:key.find('(')]
if event_list.find('\n' + key + '\n') == -1:
event_list += key + '\n'
sys.stdout.write(event_list)
return ""

if options.log:
log(stats)
elif not options.once:
Expand Down

0 comments on commit 67fbcd6

Please sign in to comment.