From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next 2/3] tools: ynl: rename ops_list -> msg_list
Date: Wed, 25 Jan 2023 16:02:34 -0800 [thread overview]
Message-ID: <20230126000235.1085551-3-kuba@kernel.org> (raw)
In-Reply-To: <20230126000235.1085551-1-kuba@kernel.org>
ops_list contains all the operations, but the main iteration use
case is to walk only ops which define attrs. Rename ops_list to
msg_list, because now it looks like the contents are the same,
just the format is different. While at it convert from tuple
to just keys, none of the users care about the name of the op.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
tools/net/ynl/ynl-gen-c.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py
index 91df8eec86f9..9297cfacbe06 100755
--- a/tools/net/ynl/ynl-gen-c.py
+++ b/tools/net/ynl/ynl-gen-c.py
@@ -790,8 +790,10 @@ import yaml
self.mcgrps = self.yaml.get('mcast-groups', {'list': []})
self.consts = dict()
+ # list of all operations
+ self.msg_list = []
+ # dict of operations which have their own message type (have attributes)
self.ops = dict()
- self.ops_list = []
self.attr_sets = dict()
self.attr_sets_list = []
@@ -858,7 +860,7 @@ import yaml
op = Operation(self, elem, val)
val += 1
- self.ops_list.append((elem['name'], op),)
+ self.msg_list.append(op)
if 'notify' in elem:
ntf.append(op)
continue
@@ -2063,7 +2065,7 @@ _C_KW = {
max_value = f"({cnt_name} - 1)"
uapi_enum_start(family, cw, family['operations'], 'enum-name')
- for _, op in family.ops_list:
+ for op in family.msg_list:
if separate_ntf and ('notify' in op or 'event' in op):
continue
@@ -2082,7 +2084,7 @@ _C_KW = {
if separate_ntf:
uapi_enum_start(family, cw, family['operations'], enum_name='async-enum')
- for _, op in family.ops_list:
+ for op in family.msg_list:
if separate_ntf and not ('notify' in op or 'event' in op):
continue
--
2.39.1
next prev parent reply other threads:[~2023-01-26 0:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-26 0:02 [PATCH net-next 0/3] tools: ynl: prevent reorder and fix flags Jakub Kicinski
2023-01-26 0:02 ` [PATCH net-next 1/3] tools: ynl: support kdocs for flags in code generation Jakub Kicinski
2023-01-26 0:02 ` Jakub Kicinski [this message]
2023-01-26 0:02 ` [PATCH net-next 3/3] tools: ynl: store ops in ordered dict to avoid random ordering Jakub Kicinski
2023-01-27 0:50 ` [PATCH net-next 0/3] tools: ynl: prevent reorder and fix flags patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230126000235.1085551-3-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).