Messages in this thread | | | Date | Mon, 1 Jun 2009 16:39:10 -0400 | Subject | Re: [PATCH] update kernel's scripts/bloat-o-meter from busybox | From | Mike Frysinger <> |
| |
On Mon, Jun 1, 2009 at 15:48, Matt Mackall wrote: > On Mon, 2009-06-01 at 15:26 -0400, Robin Getz wrote: >> --- scripts/bloat-o-meter (revision 6437) >> +++ scripts/bloat-o-meter (working copy) >> @@ -9,18 +9,37 @@ >> >> 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], sys.argv[2]: > > in sys.argv[1:3]: is a bit more standard > > But this test should instead happen inside getsizes, no loop needed. > >> + if not os.path.exists(f): >> + sys.stderr.write("Error: file '%s' does not exist\n" % f) >> + usage() >> + >> +nm_args = " ".join([x for x in sys.argv[3:]]) > > nm_args = " ".join(sys.argv[3:])
ive made the argv changes in busybox upstream
>> 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 > > (seems to be some whitespace damage? there should be no tabs in this > source)
fixed the whitespace damage (all spaces)
>> old = getsizes(sys.argv[1]) >> @@ -53,8 +72,10 @@ >> 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))) > > Not terribly excited about this last bit, which is going out of its way > to right-align the total? Who cares about that?
it makes things a lot easier to read, especially in commit scripts
as for the rest of your comments, Denis or Rob can tackle those -mike -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |