Commit 9858bfc2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

tools: ynl-gen: use enum names in op strmap more carefully 



In preparation for supporting families which use different msg
ids to and from the kernel - make sure the ids in op strmap
are correct. The map is expected to be used mostly for notifications,
don't generate a separate map for the "to kernel" direction.

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

tools/net/ynl/generated/fou-user.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


/* Enums */

static const char * const fou_op_strmap[] = {

	[FOU_CMD_UNSPEC] = "unspec",

	[FOU_CMD_ADD] = "add",

	[FOU_CMD_DEL] = "del",

	[FOU_CMD_GET] = "get",

tools/net/ynl/lib/nlspec.py

+4 −0
Original line number Diff line number Diff line
@@ -442,6 +442,10 @@ class SpecFamily(SpecElement): 
            else:

                raise Exception("Can't parse directional ops")



            if req_val == req_val_next:

                req_val = None

            if rsp_val == rsp_val_next:

                rsp_val = None

            op = self.new_operation(elem, req_val, rsp_val)

            req_val = req_val_next

            rsp_val = rsp_val_next

tools/net/ynl/ynl-gen-c.py

+5 −1
Original line number Diff line number Diff line
@@ -1220,7 +1220,11 @@ def put_op_name(family, cw): 
    map_name = f'{family.name}_op_strmap'

    cw.block_start(line=f"static const char * const {map_name}[] =")

    for op_name, op in family.msgs.items():

        if op.rsp_value:

            if op.req_value == op.rsp_value:

                cw.p(f'[{op.enum_name}] = "{op_name}",')

            else:

                cw.p(f'[{op.rsp_value}] = "{op_name}",')

    cw.block_end(line=';')

    cw.nl()