[PATCH v4 10/26] src: rewrite symfile library checker in Python

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



As part of an 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.

Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
 Makefile.am              |  1 +
 scripts/check-symfile.py | 80 ++++++++++++++++++++++++++++++++++++++++
 src/Makefile.am          |  9 ++---
 src/check-symfile.pl     | 70 -----------------------------------
 4 files changed, 85 insertions(+), 75 deletions(-)
 create mode 100755 scripts/check-symfile.py
 delete mode 100755 src/check-symfile.pl

diff --git a/Makefile.am b/Makefile.am
index 030cacc726..c31aec5f45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,7 @@ EXTRA_DIST = \
   scripts/augeas-gentest.py \
   scripts/check-aclperms.py \
   scripts/check-spacing.py \
+  scripts/check-symfile.py \
   scripts/check-symsorting.py \
   scripts/header-ifdef.py \
   scripts/minimize-po.py \
diff --git a/scripts/check-symfile.py b/scripts/check-symfile.py
new file mode 100755
index 0000000000..a543a0fbcd
--- /dev/null
+++ b/scripts/check-symfile.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2012-2019 Red Hat, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+from __future__ import print_function
+
+import re
+import subprocess
+import sys
+
+if len(sys.argv) < 3:
+    print("syntax: %s SYMFILE ELFLIB(S)" % sys.argv[0], file=sys.stderr)
+
+symfile = sys.argv[1]
+elflibs = sys.argv[2:]
+
+wantsyms = {}
+gotsyms = {}
+
+ret = 0
+
+with open(symfile, "r") as fh:
+    for line in fh:
+        line = line.strip()
+        if line.find("{") != -1:
+            continue
+        if line.find("}") != -1:
+            continue
+        if line in ["global:", "local:"]:
+            continue
+        if line == "":
+            continue
+        if line[0] == '#':
+            continue
+        if line.find("*") != -1:
+            continue
+
+        line = line.strip(";")
+
+        if line in wantsyms:
+            print("Symbol $1 is listed twice", file=sys.stderr)
+            ret = 1
+        else:
+            wantsyms[line] = True
+
+for elflib in elflibs:
+    nm = subprocess.Popen(["nm", elflib], shell=False,
+                          stdout=subprocess.PIPE).stdout
+
+    for line in nm:
+        line = line.decode("utf-8")
+        symmatch = re.search(r'''^\S+\s(?:[TBD])\s(\S+)\s*$''', line)
+        if symmatch is None:
+            continue
+
+        gotsyms[symmatch.group(1)] = True
+
+
+for sym in wantsyms.keys():
+    if sym in gotsyms:
+        continue
+
+    print("Expected symbol '%s' is not in ELF library" % sym, file=sys.stderr)
+    ret = 1
+
+sys.exit(ret)
diff --git a/src/Makefile.am b/src/Makefile.am
index e79a594269..2b04890333 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -273,11 +273,11 @@ PDWTAGS = \
 # rule for libvirt.la.  However, checking symbols relies on Linux ELF layout
 if WITH_LINUX
 check-symfile: libvirt.syms libvirt.la
-	$(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms \
-	  .libs/libvirt.so
+	$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symfile.py \
+		libvirt.syms .libs/libvirt.so
 check-admin-symfile: libvirt_admin.syms libvirt-admin.la
-	$(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt_admin.syms \
-	  .libs/libvirt-admin.so
+	$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symfile.py \
+		libvirt_admin.syms .libs/libvirt-admin.so
 else ! WITH_LINUX
 check-symfile:
 check-admin-symfile:
@@ -288,7 +288,6 @@ check-symsorting:
 check-admin-symsorting:
 	$(AM_V_GEN)$(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/check-symsorting.py \
 		$(srcdir) $(ADMIN_SYM_FILES)
-EXTRA_DIST += check-symfile.pl
 
 # Keep this list synced with RPC_PROBE_FILES
 PROTOCOL_STRUCTS = \
diff --git a/src/check-symfile.pl b/src/check-symfile.pl
deleted file mode 100755
index 4f88300864..0000000000
--- a/src/check-symfile.pl
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env perl
-
-# Copyright (C) 2012-2013 Red Hat, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library.  If not, see
-# <http://www.gnu.org/licenses/>.
-
-die "syntax: $0 SYMFILE ELFLIB(S)" unless int(@ARGV) >= 2;
-
-my $symfile = shift @ARGV;
-my @elflibs = @ARGV;
-
-my %wantsyms;
-my %gotsyms;
-
-my $ret = 0;
-
-open SYMFILE, $symfile or die "cannot read $symfile: $!";
-
-while (<SYMFILE>) {
-    next if /{/;
-    next if /}/;
-    next if /global:/;
-    next if /local:/;
-    next if /^\s*$/;
-    next if /^\s*#/;
-    next if /\*/;
-
-    die "malformed line $_" unless /^\s*(\S+);$/;
-
-    if (exists $wantsyms{$1}) {
-        print STDERR "Symbol $1 is listed twice\n";
-        $ret = 1;
-    } else {
-        $wantsyms{$1} = 1;
-    }
-}
-close SYMFILE;
-
-foreach my $elflib (@elflibs) {
-    open NM, "-|", "nm", $elflib or die "cannot run 'nm $elflib': $!";
-
-    while (<NM>) {
-        next unless /^\S+\s(?:[TBD])\s(\S+)\s*$/;
-
-        $gotsyms{$1} = 1;
-    }
-
-    close NM;
-}
-
-foreach my $sym (keys(%wantsyms)) {
-    next if exists $gotsyms{$sym};
-
-    print STDERR "Expected symbol $sym is not in ELF library\n";
-    $ret = 1;
-}
-
-exit($ret);
-- 
2.21.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux