ash: do not let EXIT trap to fire in `trap`

[oweals/busybox.git] / scripts / bloat-o-meter

diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index ce59fc2d8de496ee6c12e4032949136a27ee3b62..eb6fb87d5f551b50ae96ccbd020429f34a939eb5 100755 (executable)
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -9,17 +9,36 @@
 
 import sys, os, re
 
-if len(sys.argv) != 3:
+def usage():
     sys.stderr.write("usage: %s file1 file2\n" % sys.argv[0])
     sys.exit(-1)
 
+if len(sys.argv) < 3:
+    usage()
+
+for f in sys.argv[1:3]:
+    if not os.path.exists(f):
+        sys.stderr.write("Error: file '%s' does not exist\n" % f)
+        usage()
+
+nm_args = " ".join(sys.argv[3:])
 def getsizes(file):
     sym = {}
-    for l in os.popen("nm --size-sort " + file).readlines():
-        size, type, name = l[:-1].split()
-        if type in "tTdDbB":
+    for l in os.popen("nm --size-sort %s %s" % (nm_args, file)).readlines():
+        l = l.strip()
+        # Skip empty lines
+        if not len(l): continue
+        # Skip archive members
+        if len(l.split()) == 1 and l.endswith(':'):
+          continue
+        size, type, name = l.split()
+        if type in "tTdDbBrR":
             if "." in name: name = "static." + name.split(".")[0]
             sym[name] = sym.get(name, 0) + int(size, 16)
+    for l in os.popen("readelf -S " + file).readlines():
+        x = l.split()
+        if len(x)<6 or x[1] != ".rodata": continue
+        sym[".rodata"] = int(x[5], 16)
     return sym
 
 old = getsizes(sys.argv[1])
@@ -52,8 +71,10 @@ for name in common:
 delta.sort()
 delta.reverse()
 
-print "add/remove: %s/%s grow/shrink: %s/%s up/down: %s/%s (%s)" % \
-      (add, remove, grow, shrink, up, -down, up-down)
-print "%-40s %7s %7s %+7s" % ("function", "old", "new", "delta")
+print "%-48s %7s %7s %+7s" % ("function", "old", "new", "delta")
 for d, n in delta:
-    if d: print "%-40s %7s %7s %+7d" % (n, old.get(n,"-"), new.get(n,"-"), d)
+    if d: print "%-48s %7s %7s %+7d" % (n, old.get(n,"-"), new.get(n,"-"), d)
+print "-"*78
+total="(add/remove: %s/%s grow/shrink: %s/%s up/down: %s/%s)%%sTotal: %s bytes"\
+    % (add, remove, grow, shrink, up, -down, up-down)
+print total % (" "*(80-len(total)))