From 2d9a697e41cab732f4e081744f39d7f6ad0df3ce Mon Sep 17 00:00:00 2001 From: Kevin Laatz Date: Tue, 16 Feb 2021 11:50:08 +0000 Subject: [PATCH] usertools: add file-prefix option for telemetry Currently the dpdk-telemetry.py script connects to all running DPDK apps consecutively. With the addition of this file-prefix argument, we can limit the amount of information returned providing improved consumability and precision to the user. Signed-off-by: Kevin Laatz Reviewed-by: Bruce Richardson Tested-by: Bruce Richardson Acked-by: Anatoly Burakov --- usertools/dpdk-telemetry.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/usertools/dpdk-telemetry.py b/usertools/dpdk-telemetry.py index 181859658f..e68192f93f 100755 --- a/usertools/dpdk-telemetry.py +++ b/usertools/dpdk-telemetry.py @@ -12,6 +12,7 @@ import os import glob import json import readline +import argparse # global vars TELEMETRY_VERSION = "v2" @@ -70,14 +71,21 @@ def readline_complete(text, state): return matches[state] +def get_dpdk_runtime_dir(fp): + """ Using the same logic as in DPDK's EAL, get the DPDK runtime directory + based on the file-prefix and user """ + if (os.getuid() == 0): + return os.path.join('/var/run/dpdk', fp) + return os.path.join(os.environ.get('XDG_RUNTIME_DIR', '/tmp'), 'dpdk', fp) + + readline.parse_and_bind('tab: complete') readline.set_completer(readline_complete) readline.set_completer_delims(readline.get_completer_delims().replace('/', '')) -# Path to sockets for processes run as a root user -for f in glob.glob('/var/run/dpdk/*/dpdk_telemetry.%s' % TELEMETRY_VERSION): - handle_socket(f) -# Path to sockets for processes run as a regular user -for f in glob.glob('%s/dpdk/*/dpdk_telemetry.%s' % - (os.environ.get('XDG_RUNTIME_DIR', '/tmp'), TELEMETRY_VERSION)): - handle_socket(f) +parser = argparse.ArgumentParser() +parser.add_argument('-f', '--file-prefix', \ + help='Provide file-prefix for DPDK runtime directory', default='rte') +args = parser.parse_args() +rdir = get_dpdk_runtime_dir(args.file_prefix) +handle_socket(os.path.join(rdir, 'dpdk_telemetry.{}'.format(TELEMETRY_VERSION))) -- 2.20.1