From: Anna Schumaker <[email protected]>
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 <[email protected]>
---
tools/nfs-sysfs/nfs-sysfs.py | 6 ++++++
tools/nfs-sysfs/switch.py | 35 +++++++++++++++++++++++++++++++++++
tools/nfs-sysfs/sysfs.py | 10 ++++++++++
tools/nfs-sysfs/xprt.py | 12 ++++++++++++
4 files changed, 63 insertions(+)
create mode 100644 tools/nfs-sysfs/switch.py
create mode 100644 tools/nfs-sysfs/xprt.py
diff --git a/tools/nfs-sysfs/nfs-sysfs.py b/tools/nfs-sysfs/nfs-sysfs.py
index 8ff59ea9e81b..90efcbed7ac8 100755
--- a/tools/nfs-sysfs/nfs-sysfs.py
+++ b/tools/nfs-sysfs/nfs-sysfs.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/nfs-sysfs/switch.py b/tools/nfs-sysfs/switch.py
new file mode 100644
index 000000000000..afb6963a0a1f
--- /dev/null
+++ b/tools/nfs-sysfs/switch.py
@@ -0,0 +1,35 @@
+import sysfs
+import xprt
+
+class XprtSwitch:
+ def __init__(self, path):
+ self.path = path
+ self.id = int(str(path).rsplit("-", 1)[1])
+
+ self.xprts = [ xprt.Xprt(p) for p in self.path.iterdir() if p.is_dir() ]
+ self.xprts.sort()
+
+ self.__dict__.update(sysfs.read_info_file(path / "xprt_switch_info"))
+
+ def __lt__(self, rhs):
+ return self.path < rhs.path
+
+ def __str__(self):
+ line = "switch %s: num_xprts %s, num_active %s, queue_len %s" % \
+ (self.id, self.num_xprts, self.num_active, self.queue_len)
+ for x in self.xprts:
+ line += "\n %s" % x.small_str()
+ return line
+
+
+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("xprt-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/nfs-sysfs/sysfs.py b/tools/nfs-sysfs/sysfs.py
index 0b358f57bb28..32dcf74438de 100644
--- a/tools/nfs-sysfs/sysfs.py
+++ b/tools/nfs-sysfs/sysfs.py
@@ -16,3 +16,13 @@ SUNRPC = pathlib.Path(MOUNT) / "kernel" / "sunrpc"
if not SUNRPC.is_dir():
print("ERROR: sysfs does not have sunrpc directory")
sys.exit(1)
+
+
+def read_info_file(path):
+ res = dict()
+ with open(path) as info:
+ for line in info:
+ if "=" in line:
+ (key, val) = line.strip().split("=")
+ res[key] = int(val)
+ return res
diff --git a/tools/nfs-sysfs/xprt.py b/tools/nfs-sysfs/xprt.py
new file mode 100644
index 000000000000..d37537771c1d
--- /dev/null
+++ b/tools/nfs-sysfs/xprt.py
@@ -0,0 +1,12 @@
+class Xprt:
+ def __init__(self, path):
+ self.path = path
+ self.id = int(str(path).rsplit("-", 2)[1])
+ self.type = str(path).rsplit("-", 2)[2]
+ self.dstaddr = open(path / "dstaddr", 'r').readline().strip()
+
+ def __lt__(self, rhs):
+ return self.id < rhs.id
+
+ def small_str(self):
+ return "xprt %s: %s, %s" % (self.id, self.type, self.dstaddr)
--
2.32.0