From: Anna Schumaker <[email protected]>
It's mostly the same information as with xprt-switches, except with
rpc-client id prepended to the first line.
Signed-off-by: Anna Schumaker <[email protected]>
---
tools/rpcsys/client.py | 27 +++++++++++++++++++++++++++
tools/rpcsys/rpcsys.py | 2 ++
tools/rpcsys/switch.py | 7 ++++---
3 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 tools/rpcsys/client.py
diff --git a/tools/rpcsys/client.py b/tools/rpcsys/client.py
new file mode 100644
index 000000000000..5192cc226aed
--- /dev/null
+++ b/tools/rpcsys/client.py
@@ -0,0 +1,27 @@
+import sysfs
+import switch
+
+class RpcClient:
+ def __init__(self, path):
+ self.path = path
+ self.id = int(str(path).rsplit("-", 1)[1])
+ self.switch = switch.XprtSwitch(path / (path / "switch").readlink(), sep=",")
+
+ def __lt__(self, rhs):
+ return self.id < rhs.id
+
+ def __str__(self):
+ return "client %s: %s" % (self.id, self.switch)
+
+
+def list_rpc_clients(args):
+ clients = [ RpcClient(f) for f in (sysfs.SUNRPC / "rpc-clients").iterdir() ]
+ clients.sort()
+ for client in clients:
+ if args.id == None or client.id == args.id[0]:
+ print(client)
+
+def add_command(subparser):
+ parser = subparser.add_parser("rpc-client", help="Commands for rpc clients")
+ parser.add_argument("--id", metavar="ID", nargs=1, type=int, help="Id of a specific client to show")
+ parser.set_defaults(func=list_rpc_clients)
diff --git a/tools/rpcsys/rpcsys.py b/tools/rpcsys/rpcsys.py
index dfad6ac08fa0..e2172cdfa4c1 100755
--- a/tools/rpcsys/rpcsys.py
+++ b/tools/rpcsys/rpcsys.py
@@ -10,9 +10,11 @@ def show_small_help(args):
parser.set_defaults(func=show_small_help)
+import client
import switch
import xprt
subparser = parser.add_subparsers(title="commands")
+client.add_command(subparser)
switch.add_command(subparser)
xprt.add_command(subparser)
diff --git a/tools/rpcsys/switch.py b/tools/rpcsys/switch.py
index afb6963a0a1f..5384f970235c 100644
--- a/tools/rpcsys/switch.py
+++ b/tools/rpcsys/switch.py
@@ -2,9 +2,10 @@ import sysfs
import xprt
class XprtSwitch:
- def __init__(self, path):
+ def __init__(self, path, sep=":"):
self.path = path
self.id = int(str(path).rsplit("-", 1)[1])
+ self.sep = sep
self.xprts = [ xprt.Xprt(p) for p in self.path.iterdir() if p.is_dir() ]
self.xprts.sort()
@@ -15,8 +16,8 @@ class XprtSwitch:
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)
+ line = "switch %s%s num_xprts %s, num_active %s, queue_len %s" % \
+ (self.id, self.sep, self.num_xprts, self.num_active, self.queue_len)
for x in self.xprts:
line += "\n %s" % x.small_str()
return line
--
2.33.1