system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-15 15:59:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools/kvm_stat: switch to argparse

Browse source 
optparse is deprecated for a while, hence switching over to argparse
(which also works with python2).
As a consequence, help output has some subtle changes, the most
significant one being that the options are all listed explicitly
instead of a universal '[options]' indicator. Also, some of the error
messages are phrased slightly different.
While at it, squashed a number of minor PEP8 issues.

Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>
Message-Id: <20200306114250.57585-3-raspl@linux.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Stefan Raspl 2020-03-06 12:42:45 +01:00 committed by Paolo Bonzini
parent eecda7a956
commit 0e6618fba8
1 changed files with 61 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
tools/kvm/kvm_stat/kvm_stat
View file

@ -25,7 +25,7 @@ import sys
import locale import locale
import os import os
import time import time
import optparse import argparse
import ctypes import ctypes
import fcntl import fcntl
import resource import resource
@ -873,7 +873,7 @@ class Stats(object):
if options.debugfs: if options.debugfs:
providers.append(DebugfsProvider(options.pid, options.fields, providers.append(DebugfsProvider(options.pid, options.fields,
options.dbgfs_include_past)) options.debugfs_include_past))
if options.tracepoints or not providers: if options.tracepoints or not providers:
providers.append(TracepointProvider(options.pid, options.fields)) providers.append(TracepointProvider(options.pid, options.fields))
@ -1550,84 +1550,66 @@ Interactive Commands:
Press any other key to refresh statistics immediately. Press any other key to refresh statistics immediately.
""" % (PATH_DEBUGFS_KVM, PATH_DEBUGFS_TRACING) """ % (PATH_DEBUGFS_KVM, PATH_DEBUGFS_TRACING)
class PlainHelpFormatter(optparse.IndentedHelpFormatter): class Guest_to_pid(argparse.Action):
def format_description(self, description): def __call__(self, parser, namespace, values, option_string=None):
if description: try:
return description + "\n" pids = Tui.get_pid_from_gname(values)
else: except:
return "" sys.exit('Error while searching for guest "{}". Use "-p" to '
'specify a pid instead?'.format(values))
if len(pids) == 0:
sys.exit('Error: No guest by the name "{}" found'
.format(values))
if len(pids) > 1:
sys.exit('Error: Multiple processes found (pids: {}). Use "-p"'
' to specify the desired pid'.format(" ".join(pids)))
namespace.pid = pids[0]
def cb_guest_to_pid(option, opt, val, parser): argparser = argparse.ArgumentParser(description=description_text,
try: formatter_class=argparse
pids = Tui.get_pid_from_gname(val) .RawTextHelpFormatter)
except: argparser.add_argument('-1', '--once', '--batch',
sys.exit('Error while searching for guest "{}". Use "-p" to ' action='store_true',
'specify a pid instead?'.format(val)) default=False,
if len(pids) == 0: help='run in batch mode for one second',
sys.exit('Error: No guest by the name "{}" found'.format(val)) )
if len(pids) > 1: argparser.add_argument('-d', '--debugfs',
sys.exit('Error: Multiple processes found (pids: {}). Use "-p" ' action='store_true',
'to specify the desired pid'.format(" ".join(pids))) default=False,
parser.values.pid = pids[0] help='retrieve statistics from debugfs',
)
optparser = optparse.OptionParser(description=description_text, argparser.add_argument('-f', '--fields',
formatter=PlainHelpFormatter()) default='',
optparser.add_option('-1', '--once', '--batch', help='''fields to display (regex)
action='store_true', "-f help" for a list of available events''',
default=False, )
dest='once', argparser.add_argument('-g', '--guest',
help='run in batch mode for one second', type=str,
) help='restrict statistics to guest by name',
optparser.add_option('-i', '--debugfs-include-past', action=Guest_to_pid,
action='store_true', )
default=False, argparser.add_argument('-i', '--debugfs-include-past',
dest='dbgfs_include_past', action='store_true',
help='include all available data on past events for ' default=False,
'debugfs', help='include all available data on past events for'
) ' debugfs',
optparser.add_option('-l', '--log', )
action='store_true', argparser.add_argument('-l', '--log',
default=False, action='store_true',
dest='log', default=False,
help='run in logging mode (like vmstat)', help='run in logging mode (like vmstat)',
) )
optparser.add_option('-t', '--tracepoints', argparser.add_argument('-p', '--pid',
action='store_true', type=int,
default=False, default=0,
dest='tracepoints', help='restrict statistics to pid',
help='retrieve statistics from tracepoints', )
) argparser.add_argument('-t', '--tracepoints',
optparser.add_option('-d', '--debugfs', action='store_true',
action='store_true', default=False,
default=False, help='retrieve statistics from tracepoints',
dest='debugfs', )
help='retrieve statistics from debugfs', options = argparser.parse_args()
)
optparser.add_option('-f', '--fields',
action='store',
default='',
dest='fields',
help='''fields to display (regex)
"-f help" for a list of available events''',
)
optparser.add_option('-p', '--pid',
action='store',
default=0,
type='int',
dest='pid',
help='restrict statistics to pid',
)
optparser.add_option('-g', '--guest',
action='callback',
type='string',
dest='pid',
metavar='GUEST',
help='restrict statistics to guest by name',
callback=cb_guest_to_pid,
)
options, unkn = optparser.parse_args(sys.argv)
if len(unkn) != 1:
sys.exit('Error: Extra argument(s): ' + ' '.join(unkn[1:]))
try: try:
# verify that we were passed a valid regex up front # verify that we were passed a valid regex up front
re.compile(options.fields) re.compile(options.fields)