[gentoo-commits] proj/elfix:master commit in: misc/ldd/

[Anthony G. Basile]

commit:     a32f1be0a8aa82db6d1b4992b8c13793538e8870
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  4 00:20:34 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jun  4 00:20:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=a32f1be0

misc/ldd: add caching to speed up recursion

---
 misc/ldd/ldd.py | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/misc/ldd/ldd.py b/misc/ldd/ldd.py
index 3574137..447614e 100755
--- a/misc/ldd/ldd.py
+++ b/misc/ldd/ldd.py
@@ -76,23 +76,35 @@ def ldpaths(ld_so_conf='/etc/ld.so.conf'):
     return paths
 
 
+# We cache the dependencies for speed.  The structure is
+# { ELFClass : { SONAME : library, ... }, ELFClass : ... }
+cache = {}
+
 def dynamic_dt_needed_paths( dt_needed, eclass, paths):
     """ Search library paths for the library file corresponding
         to the given DT_NEEDED and ELF Class.
     """
+    global cache
+    if not eclass in cache:
+        cache[eclass] = {}
+
     dt_needed_paths = {}
     for n in dt_needed:
-        for p in paths:
-            lib = p + os.sep + n
-            if os.path.exists(lib):
-                with open(lib, 'rb') as file:
-                    try:
-                        readlib = ReadElf(file)
-                        if eclass == readlib.elf_class():
-                            dt_needed_paths[n] = lib
-                    except ELFError as ex:
-                        sys.stderr.write('ELF error: %s\n' % ex)
-                        sys.exit(1)
+        if n in cache[eclass].keys():
+           dt_needed_paths[n] = cache[eclass][n]
+        else:
+            for p in paths:
+                lib = p + os.sep + n
+                if os.path.exists(lib):
+                    with open(lib, 'rb') as file:
+                        try:
+                            readlib = ReadElf(file)
+                            if eclass == readlib.elf_class():
+                                dt_needed_paths[n] = lib
+                                cache[eclass][n] = lib
+                        except ELFError as ex:
+                            sys.stderr.write('ELF error: %s\n' % ex)
+                            sys.exit(1)
 
     return dt_needed_paths