From cef009cc4a76c5bfd28d68eab2b3273243fddcdc Mon Sep 17 00:00:00 2001 From: Donald Hunter Date: Wed, 13 Nov 2024 09:08:42 +0000 Subject: Revert "tools/net/ynl: improve async notification handling" This reverts commit 1bf70e6c3a5346966c25e0a1ff492945b25d3f80. This modification to check_ntf() is being reverted so that its behaviour remains equivalent to ynl_ntf_check() in the C YNL. Instead a new poll_ntf() will be added in a separate patch. Signed-off-by: Donald Hunter Link: https://patch.msgid.link/20241113090843.72917-2-donald.hunter@gmail.com Signed-off-by: Jakub Kicinski --- tools/net/ynl/cli.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'tools/net/ynl/cli.py') diff --git a/tools/net/ynl/cli.py b/tools/net/ynl/cli.py index 5e2913a7f3e4..873463dbdcc0 100755 --- a/tools/net/ynl/cli.py +++ b/tools/net/ynl/cli.py @@ -7,7 +7,6 @@ import pathlib import pprint import sys import time -import signal sys.path.append(pathlib.Path(__file__).resolve().parent.as_posix()) from lib import YnlFamily, Netlink, NlError @@ -21,8 +20,6 @@ class YnlEncoder(json.JSONEncoder): return list(obj) return json.JSONEncoder.default(self, obj) -def handle_timeout(sig, frame): - exit(0) def main(): description = """ @@ -87,8 +84,7 @@ def main(): ynl.ntf_subscribe(args.ntf) if args.sleep: - signal.signal(signal.SIGALRM, handle_timeout) - signal.alarm(args.sleep) + time.sleep(args.sleep) if args.list_ops: for op_name, op in ynl.ops.items(): @@ -113,8 +109,8 @@ def main(): exit(1) if args.ntf: - for msg in ynl.check_ntf(): - output(msg) + ynl.check_ntf() + output(ynl.async_msg_queue) if __name__ == "__main__": -- cgit v1.2.3