From: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx> This combines the information found in xprt_switch_info with a subset of the information found in each xprt subdirectory Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx> --- v5: Clean up how the XprtSwitch __str__() function works Rename the subcommand to simply "switch" --- tools/rpcctl/rpcctl.py | 6 ++++++ tools/rpcctl/switch.py | 35 +++++++++++++++++++++++++++++++++++ tools/rpcctl/sysfs.py | 18 ++++++++++++++++++ tools/rpcctl/xprt.py | 14 ++++++++++++++ 4 files changed, 73 insertions(+) create mode 100644 tools/rpcctl/switch.py create mode 100644 tools/rpcctl/xprt.py diff --git a/tools/rpcctl/rpcctl.py b/tools/rpcctl/rpcctl.py index 8ff59ea9e81b..90efcbed7ac8 100755 --- a/tools/rpcctl/rpcctl.py +++ b/tools/rpcctl/rpcctl.py @@ -9,5 +9,11 @@ def show_small_help(args): print("sunrpc dir:", sysfs.SUNRPC) parser.set_defaults(func=show_small_help) + +import switch +subparser = parser.add_subparsers(title="commands") +switch.add_command(subparser) + + args = parser.parse_args() args.func(args) diff --git a/tools/rpcctl/switch.py b/tools/rpcctl/switch.py new file mode 100644 index 000000000000..c96e70b7710f --- /dev/null +++ b/tools/rpcctl/switch.py @@ -0,0 +1,35 @@ +import sysfs +import xprt + +class XprtSwitch: + def __init__(self, path): + self.path = path + self.id = int(path.stem.split("-")[1]) + self.info = sysfs.read_info_file(path / "xprt_switch_info") + + self.xprts = [ xprt.Xprt(p) for p in self.path.iterdir() if p.is_dir() ] + self.xprts.sort() + + def __lt__(self, rhs): + return self.path < rhs.path + + def __str__(self): + switch = f"switch {self.id}: " \ + f"xprts {self.info['num_xprts']}, " \ + f"active {self.info['num_active']}, " \ + f"queue {self.info['queue_len']}" + xprts = [ f" {x.small_str()}" for x in self.xprts ] + return "\n".join([ switch ] + xprts) + + +def list_xprt_switches(args): + switches = [ XprtSwitch(f) for f in (sysfs.SUNRPC / "xprt-switches").iterdir() ] + switches.sort() + for xs in switches: + if args.id == None or xs.id == args.id[0]: + print(xs) + +def add_command(subparser): + parser = subparser.add_parser("switch", help="Commands for xprt switches") + parser.add_argument("--id", metavar="ID", nargs=1, type=int, help="Id of a specific xprt-switch to show") + parser.set_defaults(func=list_xprt_switches) diff --git a/tools/rpcctl/sysfs.py b/tools/rpcctl/sysfs.py index c9d477063585..c05d2d591175 100644 --- a/tools/rpcctl/sysfs.py +++ b/tools/rpcctl/sysfs.py @@ -1,3 +1,4 @@ +import collections import pathlib import re import sys @@ -17,3 +18,20 @@ SUNRPC = pathlib.Path(MOUNT) / "kernel" / "sunrpc" if not SUNRPC.is_dir(): print("ERROR: sysfs does not have sunrpc directory") sys.exit(1) + + +def read_addr_file(path): + try: + with open(path, 'r') as f: + return f.readline().strip() + except: + return "(enoent)" + +def read_info_file(path): + res = collections.defaultdict(int) + try: + with open(path) as info: + lines = [ l.split("=", 1) for l in info if "=" in l ] + res.update({ key:int(val.strip()) for (key, val) in lines }) + finally: + return res diff --git a/tools/rpcctl/xprt.py b/tools/rpcctl/xprt.py new file mode 100644 index 000000000000..62859a23ea4d --- /dev/null +++ b/tools/rpcctl/xprt.py @@ -0,0 +1,14 @@ +import sysfs + +class Xprt: + def __init__(self, path): + self.path = path + self.id = int(path.stem.split("-")[1]) + self.type = path.stem.split("-")[2] + self.dstaddr = sysfs.read_addr_file(path / "dstaddr") + + def __lt__(self, rhs): + return self.id < rhs.id + + def small_str(self): + return f"xprt {self.id}: {self.type}, {self.dstaddr}" -- 2.33.1