@@ -1,4 +1,6 @@ +v4.1. Support calculating deltas in analyze utility. + v4.0. Track spawn points live instead of sampling. v3.7.1. Fix some nil issues with corrupted dumps (cody caughlan). CHANGELOG @@ -3,11 +3,11 @@ require 'rubygems' if !ARGV[0] - puts "Please specify a BleakHouse logfile" + puts "Please specify up to two BleakHouse logfiles" exit else $LOAD_PATH << "#{File.dirname(__FILE__)}/../lib/" require 'bleak_house/analyzer' require 'ruby-debug' if ENV['DEBUG'] - BleakHouse::Analyzer.run(ARGV[0], ARGV[1] || 20) + BleakHouse::Analyzer.run(*ARGV) end bin/bleak @@ -2,23 +2,52 @@ module BleakHouse module Analyzer - # Analyze a compatible <tt>bleak.dump</tt>. Accepts a filename and the number of lines to display. - def self.run(file, lines) - filled, free = `tail -n 2 #{file}`.split("\n") - unless filled =~ /filled/ and free =~ /free/ - raise "#{file} is incomplete or corrupted" - end - - length = `wc #{file}`.to_i - 2 + # Analyze a compatible <tt>bleak.dump</tt>. Accepts one or more filename and the number of lines to display. + def self.run(*args) + lines = args.last[/^\d+$/] ? args.pop.to_i : 20 - puts "#{length} total objects" - puts "Final heap size #{filled}, #{free}" - puts "Displaying top #{lines} most common line/class pairs\n" - - cmd = ENV['NO_TRACE'] ? "awk -F: '{print $3}' " + file : "cat #{file}" - cmd += " | sort | uniq -c | sort -nr | head -#{lines}" + raise "Can't diff more than 2 files" if args.size > 2 + + outputs = args.map do |file| + filled, free = `tail -n 2 #{file}`.split("\n") + unless filled =~ /filled/ and free =~ /free/ + raise "#{file} is incomplete or corrupted" + end + + length = `wc #{file}`.to_i - 2 + cmd = ENV['NO_TRACE'] ? "awk -F: '{print $3}' " + file : "cat #{file}" + cmd += " | sort | uniq -c | sort -nr | head -#{lines}" + + ["#{length} total objects", "#{filled} heap slots", "#{free} heap slots"] + `#{cmd}`.split("\n") + end + + if outputs.size == 1 + # Just output the data + puts "Displaying top #{lines} most common line/class pairs" + puts outputs.first + else + puts "Displaying change in top #{lines} most common line/class pairs" + puts diff(outputs) + end - puts `#{cmd}` + end + + def self.diff(outputs) + # Calculate the diff + diff = Hash.new(0) + # Iterate each item + outputs.each_with_index do |output, index| + output[3..-1].each do |line| + c, key = line.split(" ", 2) + index.zero? ? diff[key] -= c.to_i : diff[key] += c.to_i + end + end + # Format the lines in descending order + diff.sort_by do |key, value| + -value + end.map do |key, value| + "#{value.to_s.rjust(6)} #{key}" + end end end lib/bleak_house/analyzer.rb 5ae0882cad5192a1739f234c3a3740a912ab4ff7 Evan Weaver evan@cloudbur.st http://github.com/fauna/bleak_house/commit/e39df9ed3dbe15509acf3d7c2daa213e56b95bba e39df9ed3dbe15509acf3d7c2daa213e56b95bba 2008-05-20T20:57:03-07:00 2008-05-20T20:57:03-07:00 Deltas. 2d1879c88a106e0f1188bc975891dd3df303078f Evan Weaver evan@cloudbur.st