From: Haiyue Wang <haiyue.wang@intel.com>
To: dev@dpdk.org, thomas@monjalon.net, david.marchand@redhat.com,
bruce.richardson@intel.com, anatoly.burakov@intel.com,
nhorman@tuxdriver.com, mdr@ashroe.eu
Cc: Haiyue Wang <haiyue.wang@intel.com>
Subject: [dpdk-dev] [PATCH v1 2/2] devtools: updating internal symbols ABI version
Date: Thu, 30 Apr 2020 13:46:06 +0800 [thread overview]
Message-ID: <20200430054606.92715-2-haiyue.wang@intel.com> (raw)
In-Reply-To: <20200430054606.92715-1-haiyue.wang@intel.com>
INTERNAL is new introduced version, update the script that automatically
leaving internal section exactly as it is.
Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
---
devtools/update_version_map_abi.py | 37 +++++++++++++++++++++++++++---
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py
index 616412a1c..e2104e61e 100755
--- a/devtools/update_version_map_abi.py
+++ b/devtools/update_version_map_abi.py
@@ -50,7 +50,10 @@ def __parse_map_file(f_in):
stable_lines = set()
# copy experimental section as is
experimental_lines = []
+ # copy internal section as is
+ internal_lines = []
in_experimental = False
+ in_internal = False
has_stable = False
# gather all functions
@@ -63,6 +66,7 @@ def __parse_map_file(f_in):
if match:
# whatever section this was, it's not active any more
in_experimental = False
+ in_internal = False
continue
# if we're in the middle of experimental section, we need to copy
@@ -71,6 +75,12 @@ def __parse_map_file(f_in):
experimental_lines += [line]
continue
+ # if we're in the middle of internal section, we need to copy
+ # the section verbatim, so just add the line
+ if in_internal:
+ internal_lines += [line]
+ continue
+
# skip empty lines
if not line:
continue
@@ -81,7 +91,9 @@ def __parse_map_file(f_in):
cur_section = match.group("version")
# is it experimental?
in_experimental = cur_section == "EXPERIMENTAL"
- if not in_experimental:
+ # is it internal?
+ in_internal = cur_section == "INTERNAL"
+ if not in_experimental and not in_internal:
has_stable = True
continue
@@ -90,7 +102,7 @@ def __parse_map_file(f_in):
if match:
stable_lines.add(match.group("func"))
- return has_stable, stable_lines, experimental_lines
+ return has_stable, stable_lines, experimental_lines, internal_lines
def __generate_stable_abi(f_out, abi_version, lines):
@@ -132,6 +144,20 @@ def __generate_experimental_abi(f_out, lines):
# end section
print("};", file=f_out)
+def __generate_internal_abi(f_out, lines):
+ # start internal section
+ print("INTERNAL {", file=f_out)
+
+ # print all internal lines as they were
+ for line in lines:
+ # don't print empty whitespace
+ if not line:
+ print("", file=f_out)
+ else:
+ print("\t{}".format(line), file=f_out)
+
+ # end section
+ print("};", file=f_out)
def __main():
arg_parser = argparse.ArgumentParser(
@@ -158,7 +184,7 @@ def __main():
sys.exit(1)
with open(parsed.map_file) as f_in:
- has_stable, stable_lines, experimental_lines = __parse_map_file(f_in)
+ has_stable, stable_lines, experimental_lines, internal_lines = __parse_map_file(f_in)
with open(parsed.map_file, 'w') as f_out:
need_newline = has_stable and experimental_lines
@@ -169,6 +195,11 @@ def __main():
print(file=f_out)
if experimental_lines:
__generate_experimental_abi(f_out, experimental_lines)
+ if internal_lines:
+ if has_stable or experimental_lines:
+ # separate sections with a newline
+ print(file=f_out)
+ __generate_internal_abi(f_out, internal_lines)
if __name__ == "__main__":
--
2.26.2
next prev parent reply other threads:[~2020-04-30 5:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 5:46 [dpdk-dev] [PATCH v1 1/2] devtools: add internal ABI version check Haiyue Wang
2020-04-30 5:46 ` Haiyue Wang [this message]
2020-05-19 15:10 ` [dpdk-dev] [PATCH v1 2/2] devtools: updating internal symbols ABI version David Marchand
2020-05-19 15:35 ` [dpdk-dev] [PATCH v1 1/2] devtools: add internal ABI version check David Marchand
2020-05-19 16:54 ` David Marchand
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=20200430054606.92715-2-haiyue.wang@intel.com \
--to=haiyue.wang@intel.com \
--cc=anatoly.burakov@intel.com \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=mdr@ashroe.eu \
--cc=nhorman@tuxdriver.com \
--cc=thomas@monjalon.net \
/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).