railsbench 0.9.0 → 0.9.1

data/CHANGELOG

@@ -1,3 +1,109 @@
+2007-01-14 09:07  stkaes
+
+	* CHANGELOG: updated CHANGELOG
+
+2007-01-14 09:02  stkaes
+
+	* test/test_helper.rb: dos2unix
+
+2007-01-14 09:01  stkaes
+
+	* latest_changes.txt: updated latest changes
+
+2007-01-14 08:59  stkaes
+
+	* INSTALL: formatting
+
+2007-01-14 08:56  stkaes
+
+	* install.rb: automatically detect RAILS_ROOT in railsbench install
+
+2007-01-14 08:56  stkaes
+
+	* INSTALL: mention generate_benchmarks in file INSTALL
+
+2007-01-14 08:40  stkaes
+
+	* script/perf_diff, script/perf_diff_gc, script/perf_run,
+	  script/perf_run_gc, script/run_urls: display help when call with
+	  string 'help' as first argument
+
+2007-01-14 08:39  stkaes
+
+	* bin/railsbench: automatically set RAILS_ROOT when invoked from a
+	  Rails app's top level directory
+
+2007-01-14 07:57  stkaes
+
+	* README: updated README
+
+2007-01-13 23:51  stkaes
+
+	* script/generate_benchmarks: keep generated controller benchmarks
+	  sorted. output non generated benchmarks at the end of
+	  benchmarks.yml
+
+2007-01-13 10:19  stkaes
+
+	* latest_changes.txt: updated latest changes
+
+2007-01-13 10:05  stkaes
+
+	* script/generate_benchmarks: enable deletion of benchmarks for
+	  ignored controllers/actions
+
+2007-01-13 10:04  stkaes
+
+	* bin/railsbench: support help
+
+2007-01-13 06:46  stkaes
+
+	* script/generate_benchmarks: improved benchmark generator
+
+2007-01-07 15:28  stkaes
+
+	* Manifest.txt, latest_changes.txt, script/generate_benchmarks:
+	  added generate benchmarks command
+
+2007-01-07 15:27  stkaes
+
+	* install.rb: fixed install problems
+
+2007-01-07 15:27  stkaes
+
+	* lib/railsbench/perf_info.rb: fixed problems with unpatched GC
+	  -This line, and those below, will be ignored--
+	  
+	  M perf_info.rb
+
+2007-01-07 14:15  stkaes
+
+	* lib/railsbench/gc_info.rb, lib/railsbench/perf_info.rb,
+	  lib/railsbench/perf_utils.rb, lib/railsbench/railsbenchmark.rb,
+	  script/perf_bench, script/perf_comp, script/perf_comp_gc,
+	  script/perf_diff, script/perf_diff_gc, script/perf_html,
+	  script/perf_plot, script/perf_plot_gc, script/perf_prof,
+	  script/perf_run, script/perf_run_gc, script/perf_tex,
+	  script/perf_times, script/perf_times_gc, script/run_urls: updated
+	  copyright notice
+
+2007-01-07 14:06  stkaes
+
+	* install.rb: fix installation problems
+
+2007-01-07 13:57  stkaes
+
+	* lib/railsbench/version.rb: incremented version number
+
+2007-01-06 12:56  stkaes
+
+	* Rakefile, bin/railsbench, script/generate_benchmarks: added
+	  generate_benchmarks
+
+2006-12-26 11:02  stkaes
+
+	* CHANGELOG: updated changelog
+
 2006-12-26 10:31  stkaes
 
 	* INSTALL: dedription of railsbench path and railsbench postinstall

data/INSTALL

@@ -1,8 +1,9 @@
-============
-INSTALLATION
-============
+==================================================
+           RAILSBENCH INSTALLATION
+==================================================
 
-STEP 1: installing railsbench and PATH modifcation
+STEP 1: installing railsbench and PATH modification
+---------------------------------------------------
 
 If you obtained and installed railsbench as a gem, a script called
 railsbench is available in your Ruby bin directory. railsbench is a
@@ -37,6 +38,7 @@ script directory to your search path.
 
 
 STEP 2: prepare your application for benchmarking
+-------------------------------------------------
 
 Manual installation:
 
@@ -55,8 +57,12 @@ Automatic installation:
   about possible results, you can call railsbench install --dry-run
   first.
 
+In either case, run `railsbench generate_benchmarks'. This will create
+a benchmarks.yml file with a benchmark for each controller and action.
+
 
 STEP 3: optional (but highly recommended)
+-----------------------------------------
 
 Patch the ruby garbage collector using rubygc18{45}.patch, depending
 on your ruby version. Recompile ruby and copy the ruby binary and

data/Manifest.txt

@@ -18,6 +18,7 @@ lib/railsbench/perf_utils.rb
 lib/railsbench/write_headers_only.rb
 lib/railsbench/railsbenchmark.rb
 lib/benchmark.rb
+script/generate_benchmarks
 script/perf_bench
 script/perf_comp
 script/perf_comp_gc

data/README

@@ -26,12 +26,14 @@ FILES
 
   config/bechmarks.yml
                 - specification of urls to benchmark
-                  install into $RAILS_ROOT/config
+                  install into $RAILS_ROOT/config using `railsbench install'
+                  (use railsbench install)
 
   config/benchmarks.rb
                 - defines constant RAILSBENCH which is used by script perf_bench
-                  modify this to add custom argument processing
-                  install to $RAILS_ROOT/config
+                  modify this to add custom argument processing and to put data
+                  into the session
+                  install to $RAILS_ROOT/config using `railsbench install'
 
   perf_bench n options
                 - main ruby script to run a given benchmark
@@ -45,7 +47,7 @@ FILES
                       run_urls 1 -bm=all | grep Status:
 
                   switches as for perf_bench plus
-                  -warmup   : run all uris once before measuring
+                  -warmup   : run all urls once before measuring
                   -svlPV    : run test using SVL Ruby Performance Validator
                   -svlMV    : run test using SVL Ruby Memory Validator
 
@@ -74,7 +76,7 @@ FILES
                 - format output taken from perf_comp and produce a HTML table
                   for inclusion in HTML pages. Reads from standard input.
                   options:
-                    -noccs   suppress css output
+                    -noccs   suppress CSS output
                     -notable suppress table output
                     -gc      include gc statistics
 
@@ -123,132 +125,165 @@ ENVIRONMENT
                 - perf_bench sends its output to this file
 
 
+INVOCATION
+
+  The gem version installs a driver script called 'railsbench' into
+  Ruby's bin directory. Individual commands can be called by prefixing
+  with railsbench. If you tire of typing railsbench all the time, you
+  can either define an alias (alias rb="railsbench"), or you can
+  include railsbench's script directory into your seach path.
+
+
 USAGE
 
-The two main scripts are named perf_run and perf_diff.
+  The two main scripts are named perf_run and perf_diff.
 
-    perf_run 100
+      perf_run 100
 
-runs the list of urls named "default" specified in benchmkarks.yml
-(see below), requesting each url $RAILS_PERF_RUNS * 100 times.
+  runs the list of urls named "default" specified in benchmkarks.yml
+  (see below), requesting each url $RAILS_PERF_RUNS * 100 times.
 
-   perf_run 100 "-bm=list -aws"
+     perf_run 100 "-bm=list -aws"
 
-runs the benchmark named 'list' and passes the expanded second
-argument to the rails app. By processing arguments inside your
-environment.rb file, you can set performance affecting options. For
-example, you could load action web service only if -aws is passed and
-measure the performance effect of omitting it.
+  runs the benchmark named 'list' and passes the expanded second
+  argument to the rails app. By processing arguments inside your
+  environment.rb file, you can set performance affecting options. For
+  example, you could load action web service only if -aws is passed and
+  measure the performance effect of omitting it.
 
-Benchmark data is stored in directory $RAILS_PERF_DATA, which should
-be set in your environment. If not set, $HOME is used. By default,
-data is stored in file $RAILS_PERF_DATA/perf_run.$BENCHMARK.txt, where
-BENCHMARK will be set according to the -bm option.
+  Benchmark data is stored in directory $RAILS_PERF_DATA, which should
+  be set in your environment. If not set, $HOME is used. By default,
+  data is stored in file $RAILS_PERF_DATA/perf_run.$BENCHMARK.txt, where
+  BENCHMARK will be set according to the -bm option.
 
-   perf_run 100 "-bm=index -mail" mail
+     perf_run 100 "-bm=index -mail" mail
 
-will store benchmark data in file
+  will store benchmark data in file
 
-   $RAILS_PERF_DATA/`current-date�.index.mail.txt.
+     $RAILS_PERF_DATA/`current-date�.index.mail.txt.
 
-You can get nicely formatted output of benchmark data by running
+  You can get nicely formatted output of benchmark data by running
 
-  perf_times file
+    perf_times file
 
-Script perf_run will automatically print the obtained data after
-finishing the run using perf_times.
+  Script perf_run will automatically print the obtained data after
+  finishing the run using perf_times.
 
-Script perf_diff runs a list of urls with two different option lists. So
+  Script perf_diff runs a list of urls with two different option lists. So
 
-  perf_diff 100 "-bm=blogs -mysql_session" "-mail=0" "-mail=1" cf1 cf2
+    perf_diff 100 "-bm=blogs -mysql_session" "-mail=0" "-mail=1" cf1 cf2
 
-would run benchmark 'blogs' twice, first as
+  would run benchmark 'blogs' twice, first as
 
-  perf_run 100 "-bm=blogs -mysql_session -mail=0" cf1
+    perf_run 100 "-bm=blogs -mysql_session -mail=0" cf1
 
-and then
+  and then
 
-  perf_run 100 "-bm=blogs -mysql_session -mail=1" cf2
+    perf_run 100 "-bm=blogs -mysql_session -mail=1" cf2
 
-printing a comparison of the bechmark data obtained after finishing
-the second run. cf1 and cf2 can be omitted, in which case data is
-stored in $RAILS_PERF_DATA/perf_run1.$BENCHMARK.txt and
-$RAILS_PERF_DATA/perf_run2.$BENCHMARK.txt.
+  printing a comparison of the bechmark data obtained after finishing
+  the second run. cf1 and cf2 can be omitted, in which case data is
+  stored in $RAILS_PERF_DATA/perf_run1.$BENCHMARK.txt and
+  $RAILS_PERF_DATA/perf_run2.$BENCHMARK.txt.
 
-Script perf_bench can also be invoked manually to run a given
-benchmark like so:
+  Script perf_bench can also be invoked manually to run a given
+  benchmark like so:
 
-  perf_bench 100 -bm=blogs -mysql_session -mail=1 >/dev/null
+    perf_bench 100 -bm=blogs -mysql_session -mail=1 >/dev/null
 
-Performance data is sent to $RAILS_BENCHMARK_FILE, HTML output ends up
-on stdout. If RAILS_BENCHMARK_FILE is not set, performance data is
-sent to stderr.
+  Performance data is sent to $RAILS_BENCHMARK_FILE, HTML output ends up
+  on stdout. If RAILS_BENCHMARK_FILE is not set, performance data is
+  sent to stderr.
 
-Scripts perf_run_gc and perf_times_gc can be used to analyse GC performance:
+  Scripts perf_run_gc and perf_times_gc can be used to analyse GC performance:
 
-  perf_run_gc 100 "-bm=all -lib=stable11" gc.log
-  perf_times_gc gc.log
+    perf_run_gc 100 "-bm=all -lib=stable11" gc.log
+    perf_times_gc gc.log
 
-It will produce output looking like this:
+  It will produce output looking like this:
 
-GC data file: d:/perfdata/xp/perf_run.uncached.gc.txt
+  GC data file: d:/perfdata/xp/perf_run.uncached.gc.txt
 
-collections            :        40
-garbage total          :   8188429
-gc time total (sec)    :         4.03
-garbage per request    :      2047.11
-requests per collection:       100.00
+  collections            :        40
+  garbage total          :   8188429
+  gc time total (sec)    :         4.03
+  garbage per request    :      2047.11
+  requests per collection:       100.00
 
-                     mean  stddev%          min          max
-gc time(ms):       101.38     10.0        93.00       125.00
-heap slots :    400000.00      0.0    400000.00    400000.00
-live       :    192914.31      0.2    191787.00    193197.00
-freed      :    207085.69      0.2    206803.00    208213.00
-freelist   :         0.00      0.0         0.00         0.00
+                       mean  stddev%          min          max
+  gc time(ms):       101.38     10.0        93.00       125.00
+  heap slots :    400000.00      0.0    400000.00    400000.00
+  live       :    192914.31      0.2    191787.00    193197.00
+  freed      :    207085.69      0.2    206803.00    208213.00
+  freelist   :         0.00      0.0         0.00         0.00
 
-Note that these numbers, especially requests per collection, are only
-an approximation. This is due to the fact that run_urls will add one
-final garbage collection call at the end of the run. Of course, higher
-number of iterations will produce more accurate data. Also, if the
-benchmark lists several uris, garbage per request will not give you
-meaningful information.
+  Note that these numbers, especially requests per collection, are only
+  an approximation. This is due to the fact that run_urls will add one
+  final garbage collection call at the end of the run. Of course, higher
+  number of iterations will produce more accurate data. Also, if the
+  benchmark lists several uris, garbage per request will not give you
+  meaningful information.
 
 
 CONFIGURATION
 
-Benchmarks are configured through file benchmarks.yml. Example:
+  Benchmarks are configured through file benchmarks.yml. Example:
+
+    default:
+      index, other
 
-  default:
-    index, other
+    index:
+      uri: /test/index
+      new_session: true
 
-  index:
-    uri: /test/index
-    new_session: true
+    other:
+      -
+        uri: /test/list
+      -
+        uri: /test/alphabetic
+        query_params: page=7
+
+  defines 3 benchmarks:
+
+    "other"    consists of 2 urls (/test/list and /test/alphabetic)
+    "index"    will run (/test/index)
+    "default"  will run all urls in "index" and "other"
+
+  uri: is mandatory, query_params: and new_session: are optional.
+
+  Instead of
 
-  other:
-    -
-      uri: /test/list
-    -
       uri: /test/alphabetic
       query_params: page=7
 
-defines 3 benchmarks:
+  one could have written
+
+      uri: /test/alphabetic?page=7
 
-  "other"    consists of 2 urls (/test/list and /test/alphabetic)
-  "index"    will run (/test/index)
-  "default"  will run all urls in "index" and "other"
+  new_session: specifies whether a session cookie is sent with the
+  request (default). To make this work correctly, you need to set
+  session_data on the benchmarker instance. See benchmarks.rb for details.
 
-uri: is mandatory, query_params: and new_session: are optional.
+  An inital benchmark configuration file can be generated using command
+  generate_benchmarks.
 
-Instead of
+     generate_benchmarks -exclude_controllers=application,admin \
+        -exclude_actions=edit,delete,destroy
 
-    uri: /test/alphabetic
-    query_params: page=7
+  will generate a benchmark configuration file containing definitions
+  for the following benchmarks:
 
-one could have written
+    a) an entry for each named route
+    b) an entry for each route generated from by the unnamed route definitions
+    c) an entry for each controller, combining all actions (named xyz_controller)
+    d) an entry combining all controllers (all_controllers), combining all
+       benchmarks generated by step c.
 
-    uri: /test/alphabetic?page=7
+  After generating the benchmark configuration file you will need to
+  edit the benchmarks and change the placeholders in urls to real
+  values; i.e., change something like /blog/edit/:id to /blog/edit/235.
 
-new_session: specifies whether a session cookie is sent with the
-request (default). To make this work correctly, you need to set
-session_data on the benchmarker instance. See benchmarks.rb for details.
+  generate_benchmarks can be used on an existing configuration file. It
+  will keep exisiting entries, which will be moved to the end of the
+  config file. Thus it can be used to quickly update the config file
+  after you've added/deleted or renamed controllers and/or actions.

data/Rakefile

@@ -43,7 +43,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
   p.need_zip = true
   p.spec_extras = {:has_rdoc => false}
-  p.changes = `cat latest_changes`
+  p.changes = `cat latest_changes.txt`
 
   # == Optional
   #p.changes        - A description of the release's latest changes.

data/bin/railsbench

@@ -2,6 +2,8 @@
 
 RAILSBENCH_CMDS = %w(
 base
+generate_benchmarks
+help
 install
 path
 perf_comp
@@ -18,6 +20,7 @@ perf_tex
 perf_times
 perf_times_gc
 postinstall
+readme
 run_urls
 ).inject({}){ |h, cmd| h[cmd] = cmd; h[cmd.sub('perf_', '')] = cmd; h}
 
@@ -25,6 +28,8 @@ cmd = ARGV.shift
 unless real_cmd = RAILSBENCH_CMDS[cmd]
   $stderr.puts "railsbench: unknown command: #{cmd}"
   $stderr.puts "use one of: #{RAILSBENCH_CMDS.keys.sort.join(', ')}"
+  $stderr.puts "'railsbench help' displays README"
+  $stderr.puts "'railsbench cmd help' displays help for given command"
   exit 1
 end
 
@@ -34,6 +39,9 @@ case real_cmd
 when 'base'
   puts "railsbench is installed in: #{RAILSBENCH_BASE}"
   exit
+when 'help', 'readme'
+  File.open("#{RAILSBENCH_BASE}/README").each_line{|l| puts l}
+  exit
 when 'path'
   puts "PATH=#{RAILSBENCH_BASE}/script:$PATH"
   exit
@@ -41,7 +49,23 @@ when 'install', 'postinstall'
   load "#{RAILSBENCH_BASE}/#{real_cmd}.rb"
 else
   unless ENV['RAILS_ROOT']
-    $stderr.puts "railsbench: RAILS_ROOT not set"
+    if File.exists? 'config/environment.rb'
+      ENV['RAILS_ROOT'] = File.expand_path '.'
+    else
+      $stderr.puts "railsbench: RAILS_ROOT not set"
+      exit 1
+    end
+  end
+  unless File.exists? "#{ENV['RAILS_ROOT']}/config/benchmarks.yml"
+    $stderr.puts "railsbench: benchmarks.yml missing: run `railsbench install'"
+    exit 1
+  end
+  unless File.exists? "#{ENV['RAILS_ROOT']}/config/benchmarks.rb"
+    $stderr.puts "railsbench: benchmarks.rb missing: run `railsbench install'"
+    exit 1
+  end
+  unless File.exists? "#{ENV['RAILS_ROOT']}/config/environments/benchmarking.rb"
+    $stderr.puts "railsbench: environment 'benchmarking' missing: run `railsbench install'"
     exit 1
   end
   load "#{RAILSBENCH_BASE}/script/#{real_cmd}"

data/install.rb

@@ -9,21 +9,31 @@ end
 
 require 'yaml'
 
-unless RAILS_ROOT = ENV['RAILS_ROOT']
-  STDERR.puts "RAILS_ROOT must be fined in your environment"
-  exit 1
+unless ENV['RAILS_ROOT']
+  if File.exists? "config/environment.rb"
+    ENV['RAILS_ROOT'] = File.expand_path "."
+  else
+    $stderr.puts "RAILS_ROOT must be fined in your environment"
+    exit 1
+  end
 end
 
+RAILS_ROOT = ENV['RAILS_ROOT']
 RAILS_CONFIG = RAILS_ROOT + "/config/"
 RAILS_ENVS = RAILS_ROOT + "/config/environments/"
+RAILSBENCH_BASE = File.expand_path(File.dirname(__FILE__)) unless defined? RAILSBENCH_BASE
+
+if ARGV.first == 'help'
+  File.open("#{RAILSBENCH_BASE}/INSTALL").each_line{|l| puts l}
+end
 
-install("config/benchmarks.rb", RAILS_CONFIG, :mode => 0644) unless
+install("#{RAILSBENCH_BASE}/config/benchmarks.rb", RAILS_CONFIG, :mode => 0644) unless
   File.exists?(RAILS_CONFIG + "benchmarks.rb")
 
-install("config/benchmarks.yml", RAILS_CONFIG, :mode => 0644) unless
+install("#{RAILSBENCH_BASE}/config/benchmarks.yml", RAILS_CONFIG, :mode => 0644) unless
   File.exists?(RAILS_CONFIG + "benchmarks.yml")
 
-install("config/benchmarking.rb", RAILS_ENVS, :mode => 0644) unless
+install("#{RAILSBENCH_BASE}/config/benchmarking.rb", RAILS_ENVS, :mode => 0644) unless
   File.exists?(RAILS_ENVS + "benchmarking.rb")
 
 database = YAML::load(File.open(RAILS_CONFIG + "database.yml"))

data/lib/railsbench/gc_info.rb

@@ -106,7 +106,7 @@ end
 ### mode:ruby ***
 ### End: ***
 
-#    Copyright (C) 2006  Stefan Kaes
+#    Copyright (C) 2006, 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

data/lib/railsbench/perf_info.rb

@@ -111,6 +111,7 @@ class PerfInfo
     end
 
     PerfAttributes.each do |attr|
+      next if attr.to_s =~ /^gc_/ and !gc_stats?
       a = @entries.map{|e| e.send attr}
       [:min, :max, :mean].each do |method|
         instance_variable_set "@#{attr}_#{method}", (a.send method)
@@ -128,7 +129,7 @@ end
 ### mode:ruby ***
 ### End: ***
 
-#    Copyright (C) 2006  Stefan Kaes
+#    Copyright (C) 2006, 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

data/lib/railsbench/perf_utils.rb

@@ -162,7 +162,7 @@ end
 
 __END__
 
-#  Copyright (C) 2005, 2006  Stefan Kaes
+#  Copyright (C) 2005, 2006, 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

data/lib/railsbench/railsbenchmark.rb

@@ -387,7 +387,7 @@ end
 
 __END__
 
-#  Copyright (C) 2005, 2006  Stefan Kaes
+#  Copyright (C) 2005, 2006, 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

data/lib/railsbench/version.rb

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

data/script/generate_benchmarks

@@ -0,0 +1,161 @@
+#!/usr/bin/env ruby
+
+require "#{ENV['RAILS_ROOT']}/config/environment"
+require 'application'
+
+if ARGV.first == "help"
+  puts <<-"endhelp"
+  usage: railsbench generate_benchmarks -excluded_actions=<regexp> -excluded_controllers=<controller_list>
+  1) loads your application\'s routes and generates a benchmarks.yml file
+     containing benchmark definitions for each route found
+  2) for named routes, benchmark names are derived from the route name
+  3) for routes defined via map.connect, the benchmark name is derived
+     from the controller and action
+  4) for each controller, a benchmark consisting of all controller actions
+     is generated (named after the controller file name)
+  5) generates a benchmark named 'all_controllers', consisting of all
+     benchmarks generated in step 4
+  endhelp
+  exit
+end
+
+excluded_controllers = ["application"]
+excluded_actions = /delete|destroy/
+ARGV.each do |arg|
+  excluded_controllers += $1.split(/, */).compact if arg =~ /-excluded_controllers=(.*)/
+  excluded_actions = Regexp.new($1.gsub(/,/, '|')) if arg =~ /-excluded_actions=(.*)/
+end
+
+benchmark_config = File.expand_path "#{RAILS_ROOT}/config/benchmarks.yml"
+
+if File.exist? benchmark_config
+  benchmarks = YAML::load(File.open(benchmark_config)) || {}
+else
+  benchmarks = {}
+end
+
+VALID_KEYS = %w(uri action controller new_session query_params)
+
+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
+    end
+    io.puts
+  elsif entry.is_a? String
+    io.printf "    %s\n\n", entry
+  else
+    raise "unsupported YAML entry"
+  end
+end
+
+if defined? ActionController::CodeGeneration
+  $stderr.puts "this Rails version is not supported. please upgrade to a 1.2 variety."
+  exit 1
+end
+
+rs = ActionController::Routing::Routes
+
+named_routes_map = rs.named_routes.to_a.inject({}){|h,(name,route)| h[route] = name; h}
+controller_action_map = {}
+has_default_route = false
+
+out = File.open(benchmark_config, "w")
+
+rs.routes.to_a.each do |route|
+  uri = route.segments.map(&:to_s).join
+  (has_default_route = true; next) if uri == "/:controller/:action/:id/"
+  controller = route.requirements[:controller].to_s
+  action = route.requirements[:action].to_s
+  controller_action = "#{controller}_#{action}"
+  file_name = "#{controller}_controller"
+  benchmark_name = (named_routes_map[route] || controller_action).to_s
+  entry = (benchmarks[benchmark_name] || {}).reverse_merge "uri" => uri, "controller" => controller, "action" => action
+  benchmarks.delete benchmark_name
+  if action =~ excluded_actions
+    $stderr.puts "ignored action: #{action}"
+    benchmarks[file_name] = ((benchmarks[file_name]||"").split(/, */) - [benchmark_name]).uniq.join(', ')
+    next
+  end
+  if excluded_controllers.include? controller
+    $stderr.puts "ignored controller: #{controller}"
+    benchmarks["all_controllers"] = ((benchmarks["all_controllers"]||"").split(/, */) - [file_name]).uniq.join(', ')
+    next
+  end
+  dump_entry benchmark_name, entry, out
+  controller_action_map[controller_action] = true
+  benchmarks[file_name] = ((benchmarks[file_name]||"").split(/, */) + [benchmark_name]).uniq.join(', ')
+  benchmarks["all_controllers"] = ((benchmarks["all_controllers"]||"").split(/, */) + [file_name]).uniq.join(', ')
+end
+
+if has_default_route
+  $stderr.puts "warning: you are still using the default route"
+  Dir["#{RAILS_ROOT}/app/controllers/*.rb"].each do |file|
+    file_name = File.basename(file).sub(/\.rb$/,'')
+    controller_name = file_name.sub(/_controller$/,'')
+    if excluded_controllers.include? controller_name
+      $stderr.puts "ignored controller: #{controller_name}"
+      benchmarks["all_controllers"] = ((benchmarks["all_controllers"]||"").split(/, */) - [file_name]).uniq.join(', ')
+      next
+    end
+    begin
+      controller = file_name.classify.constantize
+      controller.action_methods.map(&:to_s).each do |method|
+        benchmark_name = "#{controller_name}_#{method}"
+        next if controller_action_map[benchmark_name]
+        uri = rs.generate({:controller => controller_name ,:action => method},{})
+        entry = (benchmarks[benchmark_name] || {}).reverse_merge "uri" => uri, "controller" => controller_name, "action" => method
+        benchmarks.delete benchmark_name
+        if method =~ excluded_actions
+          $stderr.puts "ignored action: #{method}"
+          benchmarks[file_name] = ((benchmarks[file_name]||"").split(/, */) - [benchmark_name]).uniq.join(', ')
+          next
+        end
+        dump_entry benchmark_name, entry, out
+        benchmarks[file_name] = ((benchmarks[file_name]||"").split(/, */) + [benchmark_name]).uniq.join(', ')
+        benchmarks["all_controllers"] = ((benchmarks["all_controllers"]||"").split(/, */) + [file_name]).uniq.join(', ')
+      end
+    rescue MissingSourceFile, NoMethodError, ActionController::RoutingError
+    end
+  end
+end
+
+# dump remaining benchmarks
+all_entry = benchmarks.delete "all_controllers"
+
+benchmarks.delete_if do |k,v|
+  v.is_a?(Hash) && (v["action"].to_s =~ excluded_actions || v["controller"].to_s =~ excluded_controllers)
+end
+
+generated_controller_benchmarks, others = benchmarks.partition{|k,v| k =~ /_controller$/}
+
+generated_controller_benchmarks.sort_by(&:first).each do |benchmark_name, entry|
+  dump_entry benchmark_name, entry, out
+end
+
+dump_entry "all_controllers", all_entry, out
+
+others.each do |benchmark_name, entry|
+  dump_entry benchmark_name, entry, out
+end
+
+out.close unless out.nil?
+
+__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

data/script/perf_bench

@@ -55,7 +55,7 @@ Benchmark::OUTPUT.close unless Benchmark::OUTPUT.nil? || !ENV['RAILS_BENCHMARK_F
 
 __END__
 
-#  Copyright (C) 2005, 2006  Stefan Kaes
+#  Copyright (C) 2005, 2006, 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

data/script/perf_comp

@@ -134,7 +134,7 @@ end
 
 __END__
 
-#    Copyright (C) 2005, 2006  Stefan Kaes
+#    Copyright (C) 2005, 2006, 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

data/script/perf_comp_gc

@@ -88,7 +88,7 @@ printf "freelist   : #{number_format}\n",
 
 __END__
 
-#    Copyright (C) 2005, 2006  Stefan Kaes
+#    Copyright (C) 2005, 2006, 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

data/script/perf_diff

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-if ARGV.length < 4
+if ARGV.length < 4 || ARGV.first == 'help'
   $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
@@ -31,7 +31,7 @@ system("ruby #{bindir}/perf_comp -narrow -skip_urls #{file1} #{file2}")
 
 __END__
 
-#  Copyright (C) 2005, 2006  Stefan Kaes
+#  Copyright (C) 2005, 2006, 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

data/script/perf_diff_gc

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-if ARGV.length < 4
+if ARGV.length < 4 || ARGV.first == 'help'
   $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
@@ -36,7 +36,7 @@ system("ruby #{bindir}/perf_comp_gc #{file1} #{file2}")
 
 __END__
 
-#  Copyright (C) 2005, 2006  Stefan Kaes
+#  Copyright (C) 2005, 2006, 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

data/script/perf_html

@@ -61,7 +61,7 @@ end
 
 __END__
 
-#    Copyright (C) 2005, 2006  Stefan Kaes
+#    Copyright (C) 2005, 2006, 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

data/script/perf_plot

@@ -73,7 +73,7 @@ g.write
 
 __END__
 
-#    Copyright (C) 2005, 2006  Stefan Kaes
+#    Copyright (C) 2005, 2006, 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

data/script/perf_plot_gc

@@ -93,7 +93,7 @@ g.write
 
 __END__
 
-#    Copyright (C) 2005, 2006  Stefan Kaes
+#    Copyright (C) 2005, 2006, 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

data/script/perf_prof

@@ -51,7 +51,7 @@ end
 
 __END__
 
-#  Copyright (C) 2005, 2006  Stefan Kaes
+#  Copyright (C) 2005, 2006, 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

data/script/perf_run

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-if ARGV.length == 0 || ARGV.length > 3
-  puts "usage: perf_run iterations options [conf-name]"
-  puts "example: perf_run 100 \"-bm=default -log\" pdata"
+if ARGV.length == 0 || ARGV.length > 3 || ARGV.first == 'help'
+  $stderr.puts "usage: perf_run iterations options [conf-name]"
+  $stderr.puts "example: perf_run 100 \"-bm=default -log\" pdata"
   exit 1
 end
 
@@ -22,7 +22,7 @@ perf_run("perf_run", iterations, options, benchmark_file)
 
 __END__
 
-#  Copyright (C) 2005, 2006  Stefan Kaes
+#  Copyright (C) 2005, 2006, 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

data/script/perf_run_gc

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-if ARGV.length < 2
+if ARGV.length < 2 || ARGV.first == 'help'
   $stderr.puts "usage: perf_run_gc iterations options [conf-name]"
   $stderr.puts "example: perf_run_gc 100 \"-bm=default -log\" pdata"
   exit 1
@@ -23,7 +23,7 @@ perf_run_gc("perf_run_gc", iterations, options, benchmark_file)
 
 __END__
 
-#  Copyright (C) 2005, 2006  Stefan Kaes
+#  Copyright (C) 2005, 2006, 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

data/script/perf_tex

@@ -41,7 +41,7 @@ end
 
 __END__
 
-#    Copyright (C) 2005, 2006  Stefan Kaes
+#    Copyright (C) 2005, 2006, 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

data/script/perf_times

@@ -49,7 +49,7 @@ end
 
 __END__
 
-#    Copyright (C) 2005, 2006  Stefan Kaes
+#    Copyright (C) 2005, 2006, 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

data/script/perf_times_gc

@@ -65,7 +65,7 @@ end
 
 __END__
 
-#    Copyright (C) 2005, 2006  Stefan Kaes
+#    Copyright (C) 2005, 2006, 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

data/script/run_urls

@@ -6,6 +6,12 @@ unless ENV['RAILS_ROOT']
   exit 1
 end
 
+if ARGV.length == 0 || ARGV.first == 'help'
+  $stderr.puts "usage: run_urls iterations option_1 ... option_n"
+  $stderr.puts "example: run_urls 100 -bm=default -log | grep Status:"
+  exit 1
+end
+
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'railsbench/railsbenchmark'
 require ENV['RAILS_ROOT'] + '/config/benchmarks'
@@ -30,7 +36,7 @@ RAILS_BENCHMARKER.run_urls_without_benchmark(ENV['RUBY_GC_STATS'].to_i == 1)
 
 __END__
 
-#  Copyright (C) 2005, 2006  Stefan Kaes
+#  Copyright (C) 2005, 2006, 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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: railsbench
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2006-12-26 00:00:00 +01:00
+  version: 0.9.1
+date: 2007-01-14 00:00:00 +01:00
 summary: rails benchmarking tools
 require_paths: 
 - lib
@@ -49,6 +49,7 @@ files:
 - lib/railsbench/write_headers_only.rb
 - lib/railsbench/railsbenchmark.rb
 - lib/benchmark.rb
+- script/generate_benchmarks
 - script/perf_bench
 - script/perf_comp
 - script/perf_comp_gc