git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common/mlx5: fix mempool registration
[dpdk.git]
/
devtools
/
update_version_map_abi.py
diff --git
a/devtools/update_version_map_abi.py
b/devtools/update_version_map_abi.py
index
e2104e6
..
d17b02a
100755
(executable)
--- a/
devtools/update_version_map_abi.py
+++ b/
devtools/update_version_map_abi.py
@@
-1,4
+1,4
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
3
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2019 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2019 Intel Corporation
@@
-9,20
+9,23
@@
ABI version is supplied via command-line parameter. This script is to be called
from the devtools/update-abi.sh utility.
"""
from the devtools/update-abi.sh utility.
"""
-from __future__ import print_function
import argparse
import sys
import re
def __parse_map_file(f_in):
import argparse
import sys
import re
def __parse_map_file(f_in):
- # match function name, followed by semicolon, followed by EOL
, optionally
- # with whitespace in between each item
+ # match function name, followed by semicolon, followed by EOL
or comments,
+ #
optionally
with whitespace in between each item
func_line_regex = re.compile(r"\s*"
func_line_regex = re.compile(r"\s*"
+ r"(?P<line>"
r"(?P<func>[a-zA-Z_0-9]+)"
r"\s*"
r";"
r"\s*"
r"(?P<func>[a-zA-Z_0-9]+)"
r"\s*"
r";"
r"\s*"
+ r"(?P<comment>#.+)?"
+ r")"
+ r"\s*"
r"$")
# match section name, followed by opening bracked, followed by EOL,
# optionally with whitespace in between each item
r"$")
# match section name, followed by opening bracked, followed by EOL,
# optionally with whitespace in between each item
@@
-100,14
+103,14
@@
def __parse_map_file(f_in):
# is this a function?
match = func_line_regex.match(line)
if match:
# is this a function?
match = func_line_regex.match(line)
if match:
- stable_lines.add(match.group("
func
"))
+ stable_lines.add(match.group("
line
"))
return has_stable, stable_lines, experimental_lines, internal_lines
return has_stable, stable_lines, experimental_lines, internal_lines
-def __generate_stable_abi(f_out, abi_
version
, lines):
+def __generate_stable_abi(f_out, abi_
major
, lines):
# print ABI version header
# print ABI version header
- print("DPDK_{} {{".format(abi_
version
), file=f_out)
+ print("DPDK_{} {{".format(abi_
major
), file=f_out)
# print global section if it exists
if lines:
# print global section if it exists
if lines:
@@
-117,7
+120,7
@@
def __generate_stable_abi(f_out, abi_version, lines):
# print all stable lines, alphabetically sorted
for line in sorted(lines):
# print all stable lines, alphabetically sorted
for line in sorted(lines):
- print("\t{}
;
".format(line), file=f_out)
+ print("\t{}".format(line), file=f_out)
# another blank line
print(file=f_out)
# another blank line
print(file=f_out)
@@
-165,7
+168,7
@@
def __main():
arg_parser.add_argument("map_file", type=str,
help='path to linker version script file '
arg_parser.add_argument("map_file", type=str,
help='path to linker version script file '
- '(pattern:
*
version.map)')
+ '(pattern: version.map)')
arg_parser.add_argument("abi_version", type=str,
help='target ABI version (pattern: MAJOR.MINOR)')
arg_parser.add_argument("abi_version", type=str,
help='target ABI version (pattern: MAJOR.MINOR)')
@@
-182,6
+185,7
@@
def __main():
file=sys.stderr)
arg_parser.print_help()
sys.exit(1)
file=sys.stderr)
arg_parser.print_help()
sys.exit(1)
+ abi_major = parsed.abi_version.split('.')[0]
with open(parsed.map_file) as f_in:
has_stable, stable_lines, experimental_lines, internal_lines = __parse_map_file(f_in)
with open(parsed.map_file) as f_in:
has_stable, stable_lines, experimental_lines, internal_lines = __parse_map_file(f_in)
@@
-189,7
+193,7
@@
def __main():
with open(parsed.map_file, 'w') as f_out:
need_newline = has_stable and experimental_lines
if has_stable:
with open(parsed.map_file, 'w') as f_out:
need_newline = has_stable and experimental_lines
if has_stable:
- __generate_stable_abi(f_out,
parsed.abi_version
, stable_lines)
+ __generate_stable_abi(f_out,
abi_major
, stable_lines)
if need_newline:
# separate sections with a newline
print(file=f_out)
if need_newline:
# separate sections with a newline
print(file=f_out)