Report both size and count from the heap profile processor...

tools/process-heap-prof.py

 #!/usr/bin/env python
 #
 # Copyright 2009 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
 
 # Sample usage:
 # $ ./shell --log-gc script.js
 # $ tools/process-heap-prof.py v8.log | hp2ps -c > script-heap-graph.ps
 # ('-c' enables color, see hp2ps manual page for more options)
 # or
 # $ tools/process-heap-prof.py --js-cons-profile v8.log | hp2ps -c > script-heap-graph.ps
 # to get JS constructor profile
 
 
-import csv, sys, time
+import csv, sys, time, optparse
 
-def process_logfile(filename, itemname):
+def ProcessLogFile(filename, options):
+  if options.js_cons_profile:
+    itemname = 'heap-js-cons-item'
+  else:
+    itemname = 'heap-sample-item'
+  
   first_call_time = None
   sample_time = 0.0
   sampling = False
   try:
     logfile = open(filename, 'rb')
     try:
       logreader = csv.reader(logfile)
 
       print('JOB "v8"')
       print('DATE "%s"' % time.asctime(time.localtime()))
       print('SAMPLE_UNIT "seconds"')
       print('VALUE_UNIT "bytes"')
 
       for row in logreader:
         if row[0] == 'heap-sample-begin' and row[1] == 'Heap':
           sample_time = float(row[3])/1000.0
           if first_call_time == None:
             first_call_time = sample_time
           sample_time -= first_call_time
           print('BEGIN_SAMPLE %.2f' % sample_time)
           sampling = True
         elif row[0] == 'heap-sample-end' and row[1] == 'Heap':
           print('END_SAMPLE %.2f' % sample_time)
           sampling = False
         elif row[0] == itemname and sampling:
-          print('%s %d' % (row[1], int(row[3])))
+          print(row[1]),
+          if options.count:
+            print('%d' % (int(row[2]))),
+          if options.size:
+            print('%d' % (int(row[3]))),
+          print
     finally:
       logfile.close()
   except:
     sys.exit('can\'t open %s' % filename)
 
-if sys.argv[1] == '--js-cons-profile':
-  process_logfile(sys.argv[2], 'heap-js-cons-item')
-else:
-  process_logfile(sys.argv[1], 'heap-sample-item')
+
+def BuildOptions():
+  result = optparse.OptionParser()
+  result.add_option("--js_cons_profile", help="Constructor profile",
+      default=False, action="store_true")
+  result.add_option("--size", help="Report object size",
+      default=False, action="store_true")
+  result.add_option("--count", help="Report object count",
+      default=False, action="store_true")
+  return result
+
+
+def ProcessOptions(options):
+  if not options.size and not options.count:
+    options.size = True
+  return True
+
+
+def Main():
+  parser = BuildOptions()
+  (options, args) = parser.parse_args()
+  if not ProcessOptions(options):
+    parser.print_help()
+    sys.exit();
+  
+  if not args:
+    print "Missing logfile"
+    sys.exit();
+    
+  ProcessLogFile(args[0], options)
+
+
+if __name__ == '__main__':
+  sys.exit(Main())