railsbench 0.9.2 → 0.9.8

data/script/convert_raw_data_files

@@ -1,49 +1,49 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
-
-require 'fileutils'
-require 'railsbench/benchmark_specs'
-
-ARGV.each do |file_name|
-  backup_file_name = file_name + '~'
-  FileUtils.mv(file_name, backup_file_name)
-  File.open(backup_file_name) do |infile|
-    bench_name = Hash.new{ |hash,key| hash[key] = key }
-    File.open(file_name, "w") do |outfile|
-      infile.each_line do |line|
-        case line
-        when /-bm=([^\s]+)/
-          # $stderr.puts "-bm=#{$1}"
-          outfile.puts(line)
-          benchmarks = BenchmarkSpec.load($1)
-          benchmarks.each{|spec| bench_name[spec.uri] = spec.name}
-        when /^(.*)(\s+[\d\.]+\s+[\d\.]+\s+[\d\.]+\s+\(\s*[\d\.]+\s*\))$/
-          l = $1.length
-          # $stderr.printf "%-#{l}s%s\n", $1.strip, $2
-          outfile.printf "%-#{l}s%s\n", bench_name[$1.strip], $2
-        else
-          outfile.puts(line)
-        end
-      end
-    end
-  end
-end
-
-__END__
-
-#  Copyright (C) 2007  Stefan Kaes
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#!/usr/bin/env ruby
+
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
+
+require 'fileutils'
+require 'railsbench/benchmark_specs'
+
+ARGV.each do |file_name|
+  backup_file_name = file_name + '~'
+  FileUtils.mv(file_name, backup_file_name)
+  File.open(backup_file_name) do |infile|
+    bench_name = Hash.new{ |hash,key| hash[key] = key }
+    File.open(file_name, "w") do |outfile|
+      infile.each_line do |line|
+        case line
+        when /-bm=([^\s]+)/
+          # $stderr.puts "-bm=#{$1}"
+          outfile.puts(line)
+          benchmarks = BenchmarkSpec.load($1)
+          benchmarks.each{|spec| bench_name[spec.uri] = spec.name}
+        when /^(.*)(\s+[\d\.]+\s+[\d\.]+\s+[\d\.]+\s+\(\s*[\d\.]+\s*\))$/
+          l = $1.length
+          # $stderr.printf "%-#{l}s%s\n", $1.strip, $2
+          outfile.printf "%-#{l}s%s\n", bench_name[$1.strip], $2
+        else
+          outfile.puts(line)
+        end
+      end
+    end
+  end
+end
+
+__END__
+
+#  Copyright (C) 2007, 2008  Stefan Kaes
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

data/script/generate_benchmarks

@@ -1,5 +1,15 @@
 #!/usr/bin/env ruby
 
+unless ENV['RAILS_ROOT']
+  if File.directory?("config") && File.exists?("config/environment.rb")
+    ENV['RAILS_ROOT'] = File.expand_path(".")
+  else
+    $stderr.puts("\nperf_bench: can't generate benchmarks unless RAILS_ROOT is set")
+    $stderr.puts("\nbenchmarking aborted!")
+    exit 1
+  end
+end
+
 require "#{ENV['RAILS_ROOT']}/config/environment"
 require 'application'
 
@@ -40,7 +50,7 @@ def dump_entry(name, entry, io = $stdout)
   io.puts "#{name}:"
   if entry.is_a? Hash
     VALID_KEYS.each do |key|
-      io.printf "    %15-s %s\n", key + ':', entry[key] if entry.has_key? key
+      io.printf "    %-15s %s\n", key + ':', entry[key] if entry.has_key? key
     end
     io.puts
   elsif entry.is_a? String
@@ -50,8 +60,8 @@ def dump_entry(name, entry, io = $stdout)
   end
 end
 
-unless Rails::VERSION::MAJOR >= 1 && Rails::VERSION::MINOR >= 2
-  $stderr.puts "Rails version #{Rails::VERSION::STRING} is not supported. please use a 1.2.x variety."
+unless Rails::VERSION::STRING >= "1.2"
+  $stderr.puts "Rails version #{Rails::VERSION::STRING} is not supported. please use a 1.2.x or later variety."
   exit 1
 end
 
@@ -144,7 +154,7 @@ out.close unless out.nil?
 
 __END__
 
-#    Copyright (C) 2007  Stefan Kaes
+#    Copyright (C) 2007, 2008  Stefan Kaes
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by

data/script/perf_bench

@@ -3,9 +3,12 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 
 unless ENV['RAILS_ROOT']
-  $stderr.puts("\nperf_bench: can't benchmark unless RAILS_ROOT is set")
-  $stderr.puts("\nbenchmarking aborted!")
-  exit 1
+  if File.directory?("config") && File.exists?("config/environment.rb")
+    ENV['RAILS_ROOT'] = File.expand_path(".")
+  else
+    $stderr.puts("\nperf_bench: can't benchmark unless RAILS_ROOT is set")
+    exit 1
+  end
 end
 
 trap("INT") { $stderr.puts("benchmarking aborted!"); exit!(-1) }
@@ -19,17 +22,18 @@ module Benchmark
   end
 end
 require "benchmark"
-include Benchmark
 
-bm(32) do |test|
+Benchmark.bm(32) do |test|
   test.report("loading environment") do
     require 'railsbench/railsbenchmark'
     require ENV['RAILS_ROOT'] + '/config/benchmarks'
   end
 
   trap("INT") do
-    $stderr.puts "clearing database connections ..."
-    ActiveRecord::Base.send :clear_all_cached_connections!
+    $stderr.print "clearing database connections ..."
+    ActiveRecord::Base.send :clear_all_cached_connections! if ActiveRecord::Base.respond_to?(:clear_all_cached_connections)
+    ActiveRecord::Base.send :clear_all_connections! if ActiveRecord::Base.respond_to?(:clear_all_connections)
+    $stderr.puts
     $stderr.puts "benchmarking aborted!"
     exit!(-1)
   end
@@ -53,7 +57,7 @@ Benchmark::OUTPUT.close unless Benchmark::OUTPUT.nil? || !ENV['RAILS_BENCHMARK_F
 
 __END__
 
-#  Copyright (C) 2005, 2006, 2007  Stefan Kaes
+#  Copyright (C) 2005-2008  Stefan Kaes
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

data/script/perf_comp

@@ -134,7 +134,7 @@ end
 
 __END__
 
-#    Copyright (C) 2005, 2006, 2007  Stefan Kaes
+#    Copyright (C) 2005-2008  Stefan Kaes
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by

data/script/perf_comp_gc

@@ -85,10 +85,18 @@ printf "freelist   : #{number_format}\n",
        gcis[0].freelist_min, gcis[1].freelist_min,
        gcis[0].freelist_max, gcis[1].freelist_max
 
+printf "\ngarbage per object type:\n"
+printf "%-12s %9s %9s %9s %7s\n", "object type", "#c1", "#c2", "c2-c1", "c2/c1"
+
+GCInfo.object_types(gcis).each do |object_type|
+  n1, n2 = gcis[0].garbage_totals[object_type], gcis[1].garbage_totals[object_type]
+  printf "%-12s %9d %9d %9d %7.2f\n", object_type, n1, n2, n2-n1, n2.to_f/n1
+end
+
 
 __END__
 
-#    Copyright (C) 2005, 2006, 2007  Stefan Kaes
+#    Copyright (C) 2005-2008  Stefan Kaes
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by

data/script/perf_diff

@@ -9,7 +9,7 @@ end
 bindir = File.dirname(__FILE__)
 require "#{bindir}/../lib/railsbench/perf_utils"
 
-die("perf_diff: RAILS_ROOT not set") unless ENV['RAILS_ROOT']
+determine_rails_root_or_die!
 
 iterations = ARGV[0]
 common = ARGV[1]
@@ -31,7 +31,7 @@ system("ruby #{bindir}/perf_comp #{file1} #{file2}")
 
 __END__
 
-#  Copyright (C) 2005, 2006, 2007  Stefan Kaes
+#  Copyright (C) 2005-2008  Stefan Kaes
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

data/script/perf_diff_gc

@@ -9,7 +9,7 @@ end
 bindir = File.dirname(__FILE__)
 require "#{bindir}/../lib/railsbench/perf_utils"
 
-die("perf_diff_gc: RAILS_ROOT not set") unless ENV['RAILS_ROOT']
+determine_rails_root_or_die!
 
 iterations = ARGV[0]
 common = ARGV[1]
@@ -36,7 +36,7 @@ system("ruby #{bindir}/perf_comp_gc #{file1} #{file2}")
 
 __END__
 
-#  Copyright (C) 2005, 2006, 2007  Stefan Kaes
+#  Copyright (C) 2005-2008  Stefan Kaes
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

data/script/perf_html

@@ -86,7 +86,7 @@ end
 
 __END__
 
-#    Copyright (C) 2005, 2006, 2007  Stefan Kaes
+#    Copyright (C) 2005-2008  Stefan Kaes
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by

data/script/perf_plot

@@ -1,97 +1,214 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require "gruff"
+
+require 'optparse'
+require 'ostruct'
 
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'railsbench/perf_info'
 
-# extract options
-
-selection = []
-title = "Performance Graph"
-files = []
-names = []
-labels = []
-perf_data = []
-graph_type = Gruff::Line
-graph_width = '800x600'
-font_size = 14
-output_file = "graph.png"
-colors = nil
-theme = nil
+# parse options
+o = OpenStruct.new
+o.selection = []
+o.title = "Performance Graph"
+o.files = []
+o.names = []
+o.labels = []
+o.graph_type = :line
+o.graph_width = '800x600'
+o.font_size = 14
+o.output_file = nil
+o.colors = nil
+o.theme = nil
+o.engine = :gruff
 
-ARGV.each do |arg|
-  case arg
-  when /^-only=(.*)$/
-    selection = $1.split(',').map{|s| s.strip.to_i}
-  when /^-title=(.*)$/
-    title = $1 unless $1.strip.empty?
-  when '-line'
-    graph_type = Gruff::Line
-  when '-bar'
-    graph_type = Gruff::Bar
-  when /^-width=(\d+)$/
-    graph_width = $1.to_i
-  when /^-geometry=(\d+x\d+)$/
-    graph_width = $1
-  when /^-colors=(.*)$/
-    colors = $1.split(/ *,/)
-  when /^-theme=(.*)$/
-    theme = $1
-  when /^-names=(.+)$/
-    names = $1.split(',')
-  when /^-labels=(.+)$/
-    labels = $1.split(',')
-  when /^-font_size=(\d+)$/
-    font_size = $1.to_i
-  when /^-out=(.+)$/
-    output_file = $1
-  else
-    files << File.open_or_die(arg)
-    names[files.length-1] ||= File.basename(arg).sub(/\.txt$/, '').sub(/^\d\d-\d\d\.[^\.]+./, '')
+parser = OptionParser.new do |opts|
+  opts.banner = "Usage: perf_plot [options] file1 file2 ..."
+
+  opts.separator ""
+  opts.separator "Options:"
+
+  opts.on("-t", "--title T",
+          "Specify the title for your plot") do |t|
+    o.title = t
   end
+
+  opts.on("--only LIST", Array,
+          "Restrict plot to a subset of the benchmarks") do |t|
+    o.selection = t.map{|s| s.to_i}
+  end
+
+  opts.on("--line",
+          "Plot a line graph") do |t|
+    o.graph_type = :line
+  end
+
+  opts.on("--bar",
+          "Plot a bar graph") do |t|
+    o.graph_type = :bar
+  end
+
+  opts.on("-w", "--width W", Integer,
+          "Width of the plot (pixels)") do |w|
+    o.graph_width = w
+  end
+
+  opts.on("-g", "--geometry WxH", /\d+x\d+/,
+          "Specify plot dimensions (pixels)") do |d|
+    o.graph_width = d
+  end
+
+  opts.on("-c", "--colors LIST", Array,
+          "Use specified colors for lines/bars") do |t|
+    o.colors = t
+  end
+
+  opts.on("--theme NAME",
+          "Use specified theme") do |t|
+    o.theme = t
+  end
+
+  opts.on("-e", "--engine ENGINE", [:gruff, :gnuplot],
+          "Select plotting engine: (gruff, gnuplot)") do |e|
+    o.engine = e
+  end
+
+  opts.on("-n", "--names LIST", Array,
+          "Use specified names for the legend") do |t|
+    o.names = t
+  end
+
+  opts.on("-l", "--labels LIST", Array,
+          "Use specified labels instead of benchmark names") do |t|
+    o.labels = t
+  end
+
+  opts.on("-o", "--out FILE",
+          "Specify output file") do |f|
+    o.output_file = f
+  end
+
+  opts.on("-f", "--font-size N", Integer,
+          "Overall font size to use in the plot (points)") do |n|
+    o.font_size = n
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+end
+
+# option compatibility with older versions
+args=[]
+ARGV.each do |arg|
+  arg = arg.sub("font_size", "font-size") if arg =~ /^-font_size/
+  arg = "-" + arg if arg =~ /^-(title|width|out|geometry|font-size|names|labels|colors|line|bar|only)/
+  args << arg
 end
 
-files.length > 0 or die "usage: perf_plot [options] file1 file2 ..."
+parser.parse!(args)
+
+o.output_file ||= o.engine == :gruff ? "graph.png" : "graph.pdf"
 
-pi = nil
-files.each do |file|
-  pi = PerfInfo.new(file)
-  iter = pi.iterations
-  urls = pi.requests_per_key
-  perf_data << pi.keys.map{ |key| iter*urls/pi.timings_mean(key) }
-  file.close
+args.each do |arg|
+  o.files << File.open_or_die(arg)
+  o.names[o.files.length-1] ||= File.basename(arg).sub(/\.txt$/, '').sub(/^\d\d-\d\d\.[^\.]+./, '')
 end
 
-selection = (1..(perf_data.last.length)).to_a if selection.empty?
-if labels.empty?
-  labels = pi.keys.restrict_to(selection.map{|i| i-1})
+o.files.length > 0 or die(parser.banner)
+
+class Plotter
+  attr_reader :o
+  def initialize(options)
+    @o = options
+    setup
+  end
+
+  def setup
+    pi = nil
+    @perf_data = []
+    o.files.each do |file|
+      pi = PerfInfo.new(file)
+      iter = pi.iterations
+      urls = pi.requests_per_key
+      @perf_data << pi.keys.map{ |key| iter*urls/pi.timings_mean(key) }
+      file.close
+    end
+    o.selection = (1..(@perf_data.last.length)).to_a if o.selection.empty?
+    if o.labels.empty?
+      o.labels = pi.keys.restrict_to(o.selection.map{|i| i-1})
+    end
+    @perf_data = @perf_data.map{|d| d.restrict_to(o.selection.map{|i| i-1})}
+  end
+
+  def plot_with_gruff
+    require 'gruff'
+
+    g = o.graph_type == :line ? Gruff::Line.new(o.graph_width) : Gruff::Bar.new(o.graph_width)
+    g.send "theme_#{o.theme}" if o.theme
+
+    # on OS X, ImagMagick can't find it's default font (arial) sometimes, so specify some font
+    #g.font = 'Arial-Normal' if RUBY_PLATFORM =~ /darwin/
+    g.font = 'Helvetica' if RUBY_PLATFORM =~ /darwin/
+
+    g.replace_colors(o.colors) if o.colors
+    g.title = o.title
+    g.sort = false
+    g.legend_font_size = o.font_size
+    g.legend_box_size = o.font_size
+    g.marker_font_size = o.font_size
+    g.minimum_value = 0
+    g.maximum_value = @perf_data.flatten.max.ceil
+    g.labels = o.labels.index_map
+    @perf_data.each_with_index{|d,i| g.data(o.names[i], d)}
+    g.write(o.output_file)
+  end
+
+  def plot_with_gnuplot
+    require 'gnuplot'
+    Gnuplot.open(false) do |gnuplot|
+      Gnuplot::Plot.new(gnuplot) do |plot|
+        plot.terminal "pdf noenhanced color fname 'Helvetica' fsize 5"
+        plot.output o.output_file
+        plot.xlabel "Benchmarks"
+        plot.ylabel "Requests per second"
+        plot.yrange "[0:*]"
+        plot.title  o.title
+        plot.style  "fill solid 1.0 noborder"
+        plot.style  "data #{o.graph_type == :line ? "linespoints" : "histogram"}"
+        plot.style  "histogram cluster gap 1"
+        plot.xtics  "nomirror rotate by -45"
+        label_specs = []
+        o.labels.each_with_index{ |l,i| label_specs << "\"#{l}\" #{i}" }
+        plot.xtics  "(#{label_specs.join(', ')})"
+        plot.key    "outside reverse"
+        #plot.boxwidth "0.95"
+        plot.grid "nopolar"
+        plot.grid "noxtics nomxtics ytics nomytics noztics nomztics nox2tics nomx2tics noy2tics nomy2tics nocbtics nomcbtics"
+        plot.grid "back linetype 0 linewidth 0.7"
+
+        @perf_data.each_with_index do |d,i|
+          plot.data << Gnuplot::DataSet.new([[o.names[i]] + d]) do |ds|
+            ds.using = "1 title 1"
+          end
+        end
+      end
+    end
+  end
+
+  def plot
+    send "plot_with_#{o.engine}"
+  end
 end
-perf_data = perf_data.map{|d| d.restrict_to(selection.map{|i| i-1})}
-
-# puts selection.inspect
-# puts labels.inspect
-# puts perf_data.inspect
-
-g = graph_type.new(graph_width)
-g.send "theme_#{theme}" if theme
-g.replace_colors(colors) if colors
-g.title = title
-g.sort = false
-g.legend_font_size = font_size
-g.legend_box_size = font_size
-g.marker_font_size = font_size
-g.minimum_value = 0
-g.maximum_value = perf_data.flatten.max.ceil
-g.labels = labels.index_map
-perf_data.each_with_index{|d,i| g.data(names[i], d)}
-g.write(output_file)
+
+Plotter.new(o).plot
 
 
 __END__
 
-#    Copyright (C) 2005, 2006, 2007  Stefan Kaes
+#    Copyright (C) 2005-2008  Stefan Kaes
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by