提交 d30a1ad0 编写于 作者: D Daniel P. Berrangé

src: rewrite symfile library checker in Python

As part of a goal to eliminate Perl from libvirt build tools,
rewrite the check-symfile.pl tool in Python.

This was a straight conversion, manually going line-by-line to
change the syntax from Perl to Python. Thus the overall structure
of the file and approach is the same.
Tested-by: NCole Robinson <crobinso@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 31276b3b
...@@ -48,6 +48,7 @@ EXTRA_DIST = \ ...@@ -48,6 +48,7 @@ EXTRA_DIST = \
scripts/augeas-gentest.py \ scripts/augeas-gentest.py \
build-aux/check-spacing.pl \ build-aux/check-spacing.pl \
scripts/check-aclperms.py \ scripts/check-aclperms.py \
scripts/check-symfile.py \
scripts/check-symsorting.py \ scripts/check-symsorting.py \
scripts/header-ifdef.py \ scripts/header-ifdef.py \
scripts/minimize-po.py \ scripts/minimize-po.py \
......
#!/usr/bin/env perl #!/usr/bin/env python
#
# Copyright (C) 2012-2013 Red Hat, Inc. # Copyright (C) 2012-2019 Red Hat, Inc.
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
...@@ -16,55 +16,65 @@ ...@@ -16,55 +16,65 @@
# License along with this library. If not, see # License along with this library. If not, see
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
die "syntax: $0 SYMFILE ELFLIB(S)" unless int(@ARGV) >= 2; from __future__ import print_function
import re
import subprocess
import sys
my $symfile = shift @ARGV; if len(sys.argv) < 3:
my @elflibs = @ARGV; print("syntax: %s SYMFILE ELFLIB(S)" % sys.argv[0], file=sys.stderr)
my %wantsyms; symfile = sys.argv[1]
my %gotsyms; elflibs = sys.argv[2:]
my $ret = 0; wantsyms = {}
gotsyms = {}
open SYMFILE, $symfile or die "cannot read $symfile: $!"; ret = 0
while (<SYMFILE>) { with open(symfile, "r") as fh:
next if /{/; for line in fh:
next if /}/; line = line.strip()
next if /global:/; if line.find("{") != -1:
next if /local:/; continue
next if /^\s*$/; if line.find("}") != -1:
next if /^\s*#/; continue
next if /\*/; if line in ["global:", "local:"]:
continue
if line == "":
continue
if line[0] == '#':
continue
if line.find("*") != -1:
continue
die "malformed line $_" unless /^\s*(\S+);$/; line = line.strip(";")
if (exists $wantsyms{$1}) { if line in wantsyms:
print STDERR "Symbol $1 is listed twice\n"; print("Symbol $1 is listed twice", file=sys.stderr)
$ret = 1; ret = 1
} else { else:
$wantsyms{$1} = 1; wantsyms[line] = True
}
}
close SYMFILE;
foreach my $elflib (@elflibs) { for elflib in elflibs:
open NM, "-|", "nm", $elflib or die "cannot run 'nm $elflib': $!"; nm = subprocess.Popen(["nm", elflib], shell=False,
stdout=subprocess.PIPE).stdout
while (<NM>) { for line in nm:
next unless /^\S+\s(?:[TBD])\s(\S+)\s*$/; line = line.decode("utf-8")
symmatch = re.search(r'''^\S+\s(?:[TBD])\s(\S+)\s*$''', line)
if symmatch is None:
continue
$gotsyms{$1} = 1; gotsyms[symmatch.group(1)] = True
}
close NM;
}
foreach my $sym (keys(%wantsyms)) { for sym in wantsyms.keys():
next if exists $gotsyms{$sym}; if sym in gotsyms:
continue
print STDERR "Expected symbol $sym is not in ELF library\n"; print("Expected symbol '%s' is not in ELF library" % sym, file=sys.stderr)
$ret = 1; ret = 1
}
exit($ret); sys.exit(ret)
...@@ -277,15 +277,14 @@ PDWTAGS = \ ...@@ -277,15 +277,14 @@ PDWTAGS = \
# rule for libvirt.la. However, checking symbols relies on Linux ELF layout # rule for libvirt.la. However, checking symbols relies on Linux ELF layout
if WITH_LINUX if WITH_LINUX
check-symfile: libvirt.syms libvirt.la check-symfile: libvirt.syms libvirt.la
$(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms \ $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symfile.py \
.libs/libvirt.so libvirt.syms .libs/libvirt.so
else ! WITH_LINUX else ! WITH_LINUX
check-symfile: check-symfile:
endif ! WITH_LINUX endif ! WITH_LINUX
check-symsorting: check-symsorting:
$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symsorting.py \ $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symsorting.py \
$(srcdir) $(SYM_FILES) $(srcdir) $(SYM_FILES)
EXTRA_DIST += check-symfile.pl
# Keep this list synced with RPC_PROBE_FILES # Keep this list synced with RPC_PROBE_FILES
PROTOCOL_STRUCTS = \ PROTOCOL_STRUCTS = \
......
...@@ -105,8 +105,8 @@ libvirt_admin_la_CFLAGS = \ ...@@ -105,8 +105,8 @@ libvirt_admin_la_CFLAGS = \
if WITH_LINUX if WITH_LINUX
check-admin-symfile: admin/libvirt_admin.syms libvirt-admin.la check-admin-symfile: admin/libvirt_admin.syms libvirt-admin.la
$(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl admin/libvirt_admin.syms \ $(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symfile.py \
.libs/libvirt-admin.so admin/libvirt_admin.syms .libs/libvirt-admin.so
else ! WITH_LINUX else ! WITH_LINUX
check-admin-symfile: check-admin-symfile:
endif ! WITH_LINUX endif ! WITH_LINUX
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册