aboutsummaryrefslogtreecommitdiffstats
path: root/tools/net/ynl/cli.py
diff options
context:
space:
mode:
authorDonald Hunter <donald.hunter@gmail.com>2024-11-13 09:08:42 +0000
committerJakub Kicinski <kuba@kernel.org>2024-11-14 18:09:06 -0800
commitcef009cc4a76c5bfd28d68eab2b3273243fddcdc (patch)
treed55541c599bd87276180d7123322237160030f32 /tools/net/ynl/cli.py
parentMerge branch 'net-phy-switch-eee_broken_modes-to-linkmode-bitmap-and-add-accessor' (diff)
downloadlinux-rng-cef009cc4a76c5bfd28d68eab2b3273243fddcdc.tar.xz
linux-rng-cef009cc4a76c5bfd28d68eab2b3273243fddcdc.zip
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 <donald.hunter@gmail.com> Link: https://patch.msgid.link/20241113090843.72917-2-donald.hunter@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/net/ynl/cli.py')
-rwxr-xr-xtools/net/ynl/cli.py10
1 files changed, 3 insertions, 7 deletions
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__":