Commit cef009cc authored by Donald Hunter's avatar Donald Hunter Committed by Jakub Kicinski
Browse files

Revert "tools/net/ynl: improve async notification handling" 



This reverts commit 1bf70e6c.

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: default avatarDonald Hunter <donald.hunter@gmail.com>
Link: https://patch.msgid.link/20241113090843.72917-2-donald.hunter@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 76e81a5a

tools/net/ynl/cli.py

+3 −7
Original line number Diff line number Diff line
@@ -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__":

tools/net/ynl/lib/ynl.py

+20 −29
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ import sys 
import yaml

import ipaddress

import uuid

import queue

import time



from .nlspec import SpecFamily
@@ -491,7 +489,7 @@ class YnlFamily(SpecFamily): 
        self.sock.setsockopt(Netlink.SOL_NETLINK, Netlink.NETLINK_GET_STRICT_CHK, 1)



        self.async_msg_ids = set()

        self.async_msg_queue = queue.Queue()

        self.async_msg_queue = []



        for msg in self.msgs.values():

            if msg.is_async:
@@ -905,12 +903,15 @@ class YnlFamily(SpecFamily): 


        msg['name'] = op['name']

        msg['msg'] = attrs

        self.async_msg_queue.put(msg)

        self.async_msg_queue.append(msg)



    def check_ntf(self, interval=0.1):

    def check_ntf(self):

        while True:

            try:

                reply = self.sock.recv(self._recv_size, socket.MSG_DONTWAIT)

            except BlockingIOError:

                return



            nms = NlMsgs(reply)

            self._recv_dbg_print(reply, nms)

            for nl_msg in nms:
@@ -924,20 +925,10 @@ class YnlFamily(SpecFamily): 


                decoded = self.nlproto.decode(self, nl_msg, None)

                if decoded.cmd() not in self.async_msg_ids:

                        print("Unexpected msg id while checking for ntf", decoded)

                    print("Unexpected msg id done while checking for ntf", decoded)

                    continue



                self.handle_ntf(decoded)

            except BlockingIOError:

                pass



            try:

                yield self.async_msg_queue.get_nowait()

            except queue.Empty:

                try:

                    time.sleep(interval)

                except KeyboardInterrupt:

                    return



    def operation_do_attributes(self, name):

      """