railsbench 0.8.4 → 0.9.0

data/lib/railsbench/railsbenchmark.rb

@@ -164,15 +164,22 @@ class RailsBenchmark
 
     # support ruby-prof
     ruby_prof = nil
-    ARGV.each{|arg| ruby_prof=$1 if arg =~ /-ruby_prof=(\d*\.?\d*)/ }
+    ARGV.each{|arg| ruby_prof=$1 if arg =~ /-ruby_prof=([^ ]*)/ }
     begin
       if ruby_prof
+        # redirect stderr
+        if benchmark_file = ENV['RAILS_BENCHMARK_FILE']
+          $stderr = File.open(benchmark_file, "w")
+        end
         require 'ruby-prof'
         RubyProf.clock_mode = RubyProf::WALL_TIME
         RubyProf.start
       end
     rescue LoadError
       # ruby-prof not available, do nothing
+      $stderr = STDERR
+      $stderr.puts "ruby-prof not available: giving up"
+      exit(-1)
     end
 
     # start profiler and trigger data collection if required
@@ -203,7 +210,7 @@ class RailsBenchmark
       result = RubyProf.stop
       # Print a flat profile to text
       printer = RubyProf::GraphHtmlPrinter.new(result)
-      printer.print(STDERR, ruby_prof.to_f)
+      printer.print($stderr, ruby_prof.to_f)
     end
 
     delete_test_session

data/lib/railsbench/version.rb

@@ -1,8 +1,8 @@
 module Railsbench #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 8
-    TINY  = 4
+    MINOR = 9
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/postinstall.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+if ARGV.include?('--dry-run')
+  include FileUtils::DryRun
+else
+  include FileUtils::Verbose
+end
+
+RAILSBENCH_BASE = File.expand_path(File.dirname(__FILE__)) unless defined?(RAILSBENCH_BASE)
+
+chmod 0755, Dir["#{RAILSBENCH_BASE}/script/*"]

data/script/perf_bench

@@ -3,7 +3,7 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 
 unless ENV['RAILS_ROOT']
-  $stderr.puts("\nOOPS: can't benchmark unless RAILS_ROOT is set")
+  $stderr.puts("\nperf_bench: can't benchmark unless RAILS_ROOT is set")
   $stderr.puts("\nbenchmarking aborted!")
   exit 1
 end
@@ -37,13 +37,13 @@ bm(32) do |test|
   benchmarks = YAML::load(File.open(ENV['RAILS_ROOT'] + "/config/benchmarks.yml"))
   benchmark_name = "default"
   ARGV.each{ |arg| benchmark_name = $1 if arg =~ /-bm=([a-zA-Z_0-9]+)/ }
- 
+
   RAILS_BENCHMARKER.iterations = ARGV[0].to_i
   RAILS_BENCHMARKER.url_spec = benchmarks
   RAILS_BENCHMARKER.setup_test_urls(benchmark_name)
   RAILS_BENCHMARKER.establish_test_session
   RAILS_BENCHMARKER.warmup
-  
+
   if ARGV.include?('-mix')
     RAILS_BENCHMARKER.run_url_mix(test)
   else
@@ -55,12 +55,8 @@ Benchmark::OUTPUT.close unless Benchmark::OUTPUT.nil? || !ENV['RAILS_BENCHMARK_F
 
 __END__
 
-### Local Variables: ***
-### mode:ruby ***
-### End: ***
-
 #  Copyright (C) 2005, 2006  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
@@ -70,7 +66,7 @@ __END__
 #  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/perf_comp

@@ -134,10 +134,6 @@ end
 
 __END__
 
-### Local Variables: ***
-### mode:ruby ***
-### End: ***
-
 #    Copyright (C) 2005, 2006  Stefan Kaes
 #
 #    This program is free software; you can redistribute it and/or modify

data/script/perf_comp_gc

@@ -2,7 +2,7 @@
 
 options = ""
 if ARGV.length!=2
-  puts "usage: perf_diff_gc file1 file2"
+  $stderr.puts "usage: perf_diff_gc file1 file2"
   exit 1
 end
 files=[]
@@ -13,11 +13,11 @@ ARGV.each do |arg|
     if File.stat(fn).readable?
       files << File.open(fn)
     else
-      print "file #{fn} is unreadable\n"
+      $stderr.print "file #{fn} is unreadable\n"
       exit 1
     end
   rescue
-    print "file #{fn} does not exist\n"
+    $stderr.print "file #{fn} does not exist\n"
     exit 1
   end
 end
@@ -59,12 +59,12 @@ printf "\n             %12s %12s %9s %9s %9s %9s\n",
        "c1 mean", "c2 mean", "c1 min", "c2 min", "c1 max", "c2 max"
 
 number_format = "%12.2f %12.2f %9d %9d %9d %9d"
-  
+
 printf "gc time(ms): #{number_format}\n",
        gcis[0].time_mean, gcis[1].time_mean,
        gcis[0].time_min, gcis[1].time_min,
        gcis[0].time_max, gcis[1].time_max
-   
+
 printf "heap slots : #{number_format}\n",
        gcis[0].processed_mean, gcis[1].processed_mean,
        gcis[0].processed_min, gcis[1].processed_min,
@@ -74,12 +74,12 @@ printf "live       : #{number_format}\n",
        gcis[0].live_mean, gcis[1].live_mean,
        gcis[0].live_min, gcis[1].live_min,
        gcis[0].live_max, gcis[1].live_max
-  
+
 printf "freed      : #{number_format}\n",
        gcis[0].freed_mean, gcis[1].freed_mean,
        gcis[0].freed_min, gcis[1].freed_min,
        gcis[0].freed_max, gcis[1].freed_max
-  
+
 printf "freelist   : #{number_format}\n",
        gcis[0].freelist_mean, gcis[1].freelist_mean,
        gcis[0].freelist_min, gcis[1].freelist_min,
@@ -88,10 +88,6 @@ printf "freelist   : #{number_format}\n",
 
 __END__
 
-### Local Variables: ***
-### mode:ruby ***
-### End: ***
-
 #    Copyright (C) 2005, 2006  Stefan Kaes
 #
 #    This program is free software; you can redistribute it and/or modify

data/script/perf_diff

@@ -1,48 +1,48 @@
-#!/bin/sh
-# set -x
+#!/usr/bin/env ruby
 
-if [ $# -lt 4 ]; then
-  echo "usage: perf_diff iterations common-options options1 options4 [conf-name1] [conf-name2]"
-  echo "example: perf_diff 100 \"-bm=all\"  \"-log\" \"-nocache\" c1 c2"
+if ARGV.length < 4
+  $stderr.puts 'usage: perf_diff iterations common-options options1 options4 [conf-name1] [conf-name2]'
+  $stderr.puts 'example: perf_diff 100 "-bm=all"  "-log" "-nocache" c1 c2'
   exit 1
-fi
-
-BINDIR=`dirname $0`
-test -z "$RAILS_PERF_DATA" && RAILS_PERF_DATA=$HOME
-
-ITER="$1"
-COMMON="$2"
-OPT1="$3"
-OPT2="$4"
-DATE=`date +%m-%d`
-BENCHMARK=""
-for opt in $COMMON; do
-  case $opt in
-  -bm=*) BENCHMARK=${opt#-bm=};;
-  esac
-done
-
-if [ $# -gt 4 ]; then
-  FILE1="$RAILS_PERF_DATA/${DATE}.${BENCHMARK}.$5.txt"
-else
-  FILE1="$RAILS_PERF_DATA/perf_run1.${BENCHMARK}.txt"
-fi
-if [ $# -gt 5 ]; then
-  FILE2="$RAILS_PERF_DATA/${DATE}.${BENCHMARK}.$6.txt"
-else
-  FILE2="$RAILS_PERF_DATA/perf_run2.${BENCHMARK}.txt"
-fi
-
-unset RUBY_GC_STATS
-
-PERF_OPTIONS="$ITER $COMMON $OPT1"
-RAILS_BENCHMARK_FILE=$FILE1 $BINDIR/perf_loop $PERF_OPTIONS || exit 1
-ruby $BINDIR/perf_times $FILE1
-echo;echo
-
-PERF_OPTIONS="$ITER $COMMON $OPT2"
-RAILS_BENCHMARK_FILE=$FILE2 $BINDIR/perf_loop $PERF_OPTIONS || exit 1
-ruby $BINDIR/perf_times $FILE2
-echo;echo
-
-ruby $BINDIR/perf_comp -narrow -skip_urls $FILE1 $FILE2
+end
+
+bindir = File.dirname(__FILE__)
+require "#{bindir}/../lib/railsbench/perf_utils"
+
+die("perf_diff: RAILS_ROOT not set") unless ENV['RAILS_ROOT']
+
+iterations = ARGV[0]
+common = ARGV[1]
+options1 = ARGV[2]
+options2 = ARGV[3]
+
+benchmark = "default"
+benchmark = $1 if common =~ /-bm=([^ ]+)/
+
+file1 = benchmark_file_name(benchmark, ARGV[4], 1)
+perf_run("perf_diff", iterations, "#{common} #{options1}", file1)
+puts;puts
+
+file2 = benchmark_file_name(benchmark, ARGV[5], 2)
+perf_run("perf_diff", iterations, "#{common} #{options2}", file2)
+puts;puts
+
+system("ruby #{bindir}/perf_comp -narrow -skip_urls #{file1} #{file2}")
+
+__END__
+
+#  Copyright (C) 2005, 2006  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/perf_diff_gc

@@ -1,89 +1,53 @@
-#!/bin/sh
-# set -x
+#!/usr/bin/env ruby
 
-if [ $# -lt 4 ]; then
-  echo "usage: perf_diff_gc iterations options1 options2 [conf-name1] [conf-name2]"
-  echo "example: perf_diff_gc 100 \"-bm=default\" \"-log\" \"-nocache\" c1 c2"
+if ARGV.length < 4
+  $stderr.puts 'usage: perf_diff_gc iterations options1 options2 [conf-name1] [conf-name2]'
+  $stderr.puts 'example: perf_diff_gc 100 "-bm=default" "-log" "-nocache" c1 c2'
   exit 1
-fi
+end
 
-BINDIR=`dirname $0`
-test -z "$RAILS_PERF_DATA" && RAILS_PERF_DATA=$HOME
+bindir = File.dirname(__FILE__)
+require "#{bindir}/../lib/railsbench/perf_utils"
 
-ITER="$1"
-COMMON="$2"
-OPT1="$3"
-OPT2="$4"
-BENCHMARK=""
-WARMUP="-warmup"
+die("perf_diff_gc: RAILS_ROOT not set") unless ENV['RAILS_ROOT']
 
-DATE=`date +%m-%d`
+iterations = ARGV[0]
+common = ARGV[1]
+options1 = ARGV[2]
+options2 = ARGV[3]
 
+benchmark = "default"
+benchmark = $1 if common =~ /-bm=([^ ]+)/
 
-if [ $# -gt 4 ]; then
-  FILE1="$RAILS_PERF_DATA/${DATE}${BENCHMARK}.$5.gc.txt"
-else
-  FILE1="$RAILS_PERF_DATA/perf_run1${BENCHMARK}.gc.txt"
-fi
-if [ $# -gt 5 ]; then
-  FILE2="$RAILS_PERF_DATA/${DATE}${BENCHMARK}.$6.gc.txt"
-else
-  FILE2="$RAILS_PERF_DATA/perf_run2${BENCHMARK}.gc.txt"
-fi
+file1 = benchmark_file_name(benchmark, ARGV[4], 1, :gc)
+perf_run_gc("perf_run_gc", iterations, "#{common} #{options1}", file1)
 
-OLD_RUBY_HEAP_MIN_SLOTS=$RUBY_HEAP_MIN_SLOTS
-OLD_RUBY_GC_MALLOC_LIMIT=$RUBY_GC_MALLOC_LIMIT
-OLD_RUBY_HEAP_FREE_MIN=$RUBY_HEAP_FREE_MIN
+puts;puts
 
-PERF_OPTIONS="$ITER $WARMUP $COMMON $OPT1"
+file2 = benchmark_file_name(benchmark, ARGV[5], 2, :gc)
+perf_run_gc("perf_run_gc", iterations, "#{common} #{options2}", file2)
 
-patched_gc="no"
-for opt in $COMMON $OPT1; do
-  case $opt in
-  -gc=*) patched_gc=${opt#-gc=};;
-  esac
-done
+puts;puts
 
-if [ "${patched_gc}" = "no" ]; then
-  unset RUBY_HEAP_MIN_SLOTS RUBY_GC_MALLOC_LIMIT RUBY_HEAP_FREE_MIN
-else
-  . $RAILS_ROOT/config/${patched_gc}.gc
-  export RUBY_HEAP_MIN_SLOTS RUBY_GC_MALLOC_LIMIT RUBY_HEAP_FREE_MIN
-fi
+puts "benchmark comparison data"
+puts
 
-echo "benchmarking GC performance with options $PERF_OPTIONS"
-echo
+system("ruby #{bindir}/perf_comp_gc #{file1} #{file2}")
 
-(RUBY_GC_STATS=1 RUBY_GC_DATA_FILE=$FILE1 ruby $BINDIR/run_urls $PERF_OPTIONS >/dev/null) \
- && ruby $BINDIR/perf_times_gc $FILE1
-echo;echo
+__END__
 
-PERF_OPTIONS="$ITER $WARMUP $COMMON $OPT2"
-
-patched_gc="no"
-for opt in $COMMON $OPT2; do
-  case $opt in
-  -gc=*) patched_gc=${opt#-gc=};;
-  esac
-done
-
-if [ "${patched_gc}" = "no" ]; then
-  unset RUBY_HEAP_MIN_SLOTS RUBY_GC_MALLOC_LIMIT RUBY_HEAP_FREE_MIN
-else
-  . $RAILS_ROOT/config/${patched_gc}.gc
-  export RUBY_HEAP_MIN_SLOTS RUBY_GC_MALLOC_LIMIT RUBY_HEAP_FREE_MIN
-fi
-
-echo "benchmarking GC performance with options $PERF_OPTIONS"
-echo
-
-(RUBY_GC_STATS=1 RUBY_GC_DATA_FILE=$FILE2 ruby $BINDIR/run_urls $PERF_OPTIONS >/dev/null) \
- && ruby $BINDIR/perf_times_gc $FILE2
-echo;echo
-
-unset RUBY_HEAP_MIN_SLOTS RUBY_GC_MALLOC_LIMIT RUBY_HEAP_FREE_MIN
-
-echo "benchmark comparison data"
-echo
-
-ruby $BINDIR/perf_comp_gc $FILE1 $FILE2
+#  Copyright (C) 2005, 2006  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/perf_html

@@ -61,10 +61,6 @@ end
 
 __END__
 
-### Local Variables: ***
-### mode:ruby ***
-### End: ***
-
 #    Copyright (C) 2005, 2006  Stefan Kaes
 #
 #    This program is free software; you can redistribute it and/or modify

data/script/perf_plot

@@ -73,10 +73,6 @@ g.write
 
 __END__
 
-### Local Variables: ***
-### mode:ruby ***
-### End: ***
-
 #    Copyright (C) 2005, 2006  Stefan Kaes
 #
 #    This program is free software; you can redistribute it and/or modify

data/script/perf_plot_gc

@@ -16,6 +16,7 @@ labels = %w()
 perf_data = []
 graph_type = Gruff::StackedBar
 graph_width = 1400
+ignored_object_types = %w(NODE STRING)
 
 ARGV.each do |arg|
   case arg
@@ -29,6 +30,8 @@ ARGV.each do |arg|
 #     title = $1 unless $1.strip.empty?
 #   when /^-names=(.+)$/
 #     names = $1.split(',')
+  when /^-ignore=(.*)$/
+    ignored_object_types = $1.split(',').map(&:upcase)
   else
     files << File.open_or_die(arg)
     names[files.length-1] ||= File.basename(arg)
@@ -71,7 +74,7 @@ g.labels = Hash[* (0...gc_count_max).map{|i| [2*i, i.to_s]}.flatten ]
 puts g.labels.inspect
 
 object_types.each do |ot|
-  next if ot =~ /NODE|STRING/i 
+  next if ignored_object_types.include?(ot)
   data = []
   gc_count_max.times do |gc_index|
     for gci in gcis
@@ -81,7 +84,7 @@ object_types.each do |ot|
       data << ((map_at_this_gc && map_at_this_gc[ot]) || 0)
     end
   end
-  puts "#{ot}: #{data.inspect}"
+  # puts "#{ot}: #{data.inspect}"
   g.data(ot, data)
 end
 
@@ -90,10 +93,6 @@ g.write
 
 __END__
 
-### Local Variables: ***
-### mode:ruby ***
-### End: ***
-
 #    Copyright (C) 2005, 2006  Stefan Kaes
 #
 #    This program is free software; you can redistribute it and/or modify