railsbench 0.9.1 → 0.9.2

data/BUGS

@@ -1,3 +1,2 @@
-- POST isn't supported (yet)
 - documentation could be improved
 - hoe's rake install doesn't work (which is actually hoe's problem)

data/CHANGELOG

@@ -1,3 +1,141 @@
+2007-04-01 07:29  stkaes
+
+	* latest_changes.txt, script/perf_html: -colorize option for
+	  perf_html
+
+2007-04-01 07:29  stkaes
+
+	* script/perf_plot: added -theme option
+
+2007-03-31 07:49  stkaes
+
+	* script/perf_diff: options -narrow and -skip_urls are no longer
+	  necessary
+
+2007-03-31 07:48  stkaes
+
+	* script/perf_html: allow _ in benchmark names
+
+2007-03-31 07:26  stkaes
+
+	* CHANGELOG: updated CHANGELOG
+
+2007-03-31 07:26  stkaes
+
+	* Manifest.txt: include new scripts
+
+2007-03-31 07:25  stkaes
+
+	* bin/railsbench: make new scripts callabe from railsbench
+
+2007-03-31 07:25  stkaes
+
+	* latest_changes.txt: still more changes
+
+2007-03-31 07:24  stkaes
+
+	* README: adapted README to latest changes
+
+2007-03-31 06:56  stkaes
+
+	* install.rb: copy all entries from the development database config
+
+2007-03-31 06:43  stkaes
+
+	* latest_changes.txt: lates changes description
+
+2007-03-30 10:49  stkaes
+
+	* lib/railsbench/railsbenchmark.rb: merge benchmark session data
+	  with session data from session store
+
+2007-03-30 09:43  stkaes
+
+	* lib/railsbench/benchmark_specs.rb: load benchmark file using ERB
+
+2007-03-30 09:13  stkaes
+
+	* lib/railsbench/benchmark_specs.rb,
+	  lib/railsbench/railsbenchmark.rb: make it possible to specify
+	  session data in benchmarks.yml
+
+2007-03-30 05:45  stkaes
+
+	* script/perf_table: script for generating a tabular overview
+
+2007-03-25 14:34  stkaes
+
+	* script/perf_plot: allow specification of colors
+
+2007-03-25 11:37  stkaes
+
+	* script/perf_plot: allow specification of output file
+
+2007-03-25 07:15  stkaes
+
+	* script/perf_plot: automatically remove date and benchmark names
+	  from config names
+
+2007-03-20 06:23  stkaes
+
+	* lib/railsbench/benchmark_specs.rb: don't fuck with array
+	  extensions during running rails
+
+2007-03-18 19:02  stkaes
+
+	* Manifest.txt, lib/railsbench/benchmark_specs.rb,
+	  lib/railsbench/railsbenchmark.rb, script/convert_raw_data_files,
+	  script/perf_bench, script/perf_plot, script/run_urls: refactored
+	  benchmark loading; added script for converting benchmark data
+	  files to new format
+
+2007-03-16 10:22  stkaes
+
+	* lib/railsbench/railsbenchmark.rb: added post support; use
+	  benchmark names instead of urls for display
+
+2007-03-09 07:57  stkaes
+
+	* README: it's query_string, not query_params
+
+2007-03-09 07:54  stkaes
+
+	* PROBLEMS: doc change
+
+2007-03-09 06:57  stkaes
+
+	* latest_changes.txt, script/perf_plot, script/perf_plot_gc: use
+	  -geometry=1600x1200 to specify dimensions foer generated .png
+	  files
+	  use -font_size=12 to set font size for labels, markers etc
+
+2007-02-13 08:30  stkaes
+
+	* script/perf_comp: use time instad of number of collections for gc
+	  change factor calculation
+
+2007-01-26 17:46  stkaes
+
+	* PROBLEMS: dos2unix
+
+2007-01-26 17:24  stkaes
+
+	* Manifest.txt, PROBLEMS: aded file PROBLEMS for things which are
+	  not really railsbench bugs
+
+2007-01-26 17:23  stkaes
+
+	* script/generate_benchmarks: added better version checking
+
+2007-01-26 15:26  stkaes
+
+	* lib/railsbench/version.rb: prepare for 0.9.2 release
+
+2007-01-26 15:25  stkaes
+
+	* config/benchmarks.yml: changed default benchmarks.yml to contain
+	  only default benchmark
+
 2007-01-14 09:07  stkaes
 
 	* CHANGELOG: updated CHANGELOG

data/Manifest.txt

@@ -5,6 +5,7 @@ install.rb
 postinstall.rb
 LICENSE
 Manifest.txt
+PROBLEMS
 README
 Rakefile
 setup.rb
@@ -17,8 +18,10 @@ lib/railsbench/perf_info.rb
 lib/railsbench/perf_utils.rb
 lib/railsbench/write_headers_only.rb
 lib/railsbench/railsbenchmark.rb
+lib/railsbench/benchmark_specs.rb
 lib/benchmark.rb
 script/generate_benchmarks
+script/convert_raw_data_files
 script/perf_bench
 script/perf_comp
 script/perf_comp_gc
@@ -30,6 +33,7 @@ script/perf_plot_gc
 script/perf_prof
 script/perf_run
 script/perf_run_gc
+script/perf_table
 script/perf_tex
 script/perf_times
 script/perf_times_gc

data/PROBLEMS

@@ -0,0 +1,56 @@
+You might experience the problem described below, if your
+benchmarking.rb environment file contains the line
+
+    config.action_controller.view_controller_internals = false
+
+
+This is the preferred setting for a production mode config file, but
+can cause problems when a view template tries to access a method only
+available when view_controller_internals is true.
+
+If you experierence backtraces like the one below, try the setting
+
+    config.action_controller.view_controller_internals = true
+
+Typical backtrace:
+
+ActionView::TemplateError (undefined method `each' for nil:NilClass) on line #1 of app/views/test/param_access_t
+est.rhtml:
+1: <% for k,v in params %>
+2: <%= h k %> = <%= h v %>
+3: <% end %>
+4:
+
+    #{RAILS_ROOT}/app/views/test/param_access_test.rhtml:1:in `_run_rhtml_47app47views47test47param_access_test46rhtml'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_view/base.rb:326:in `compile_and_render_template'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_view/base.rb:301:in `render_template'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_view/base.rb:260:in `render_file'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/base.rb:806:in `render_file'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/base.rb:711:in `render_with_no_layout'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/layout.rb:256:in `render_without_benchmark'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/benchmarking.rb:50:in `render'
+    c:/ruby184/lib/ruby/gems/1.8/gems/railsbench-0.9.2/lib/benchmark.rb:300:in `measure'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/benchmarking.rb:50:in `render'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/base.rb:1096:in `perform_action_without_filters'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/filters.rb:632:in `call_filter'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/filters.rb:638:in `call_filter'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/filters.rb:438:in `call'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/filters.rb:637:in `call_filter'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/filters.rb:634:in `call_filter'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/filters.rb:619:in `perform_action_without_benchmark'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/benchmarking.rb:66:in `perform_action_without_rescue'
+    c:/ruby184/lib/ruby/gems/1.8/gems/railsbench-0.9.2/lib/benchmark.rb:300:in `measure'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/benchmarking.rb:66:in `perform_action_without_rescue'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/rescue.rb:83:in `perform_action'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/base.rb:430:in `process_without_filters'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/filters.rb:624:in `process_without_session_management_support'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/session_management.rb:114:in `process'
+    c:/home/skaes/svn/trunk12pre/actionpack/lib/action_controller/base.rb:330:in `process'
+    c:/home/skaes/svn/trunk12pre/railties/lib/dispatcher.rb:41:in `dispatch'
+    c:/ruby184/lib/ruby/gems/1.8/gems/railsbench-0.9.2/lib/railsbench/railsbenchmark.rb:262:in `run_urls_without_benchmark_and_without_gc_control'
+    c:/ruby184/lib/ruby/gems/1.8/gems/railsbench-0.9.2/lib/railsbench/railsbenchmark.rb:261:in `run_urls_without_benchmark_and_without_gc_control'
+    c:/ruby184/lib/ruby/gems/1.8/gems/railsbench-0.9.2/lib/railsbench/railsbenchmark.rb:259:in `run_urls_without_benchmark_and_without_gc_control'
+    c:/ruby184/lib/ruby/gems/1.8/gems/railsbench-0.9.2/lib/railsbench/railsbenchmark.rb:194:in `run_urls_without_benchmark'
+    c:/ruby184/lib/ruby/gems/1.8/gems/railsbench-0.9.2/script/run_urls:35
+    c:/ruby184/lib/ruby/gems/1.8/gems/railsbench-0.9.2/bin/railsbench:71
+    /ruby184/bin/railsbench:18

data/README

@@ -104,10 +104,15 @@ FILES
                   file name is computed from date and benchmark name as described above
                   but has a .html extension instead of .txt
 
-  perf_plot n [ options ] file1 file2 ...
+  perf_plot [ options ] file1 file2 ...
                 - plot performance data from raw performance files using gruff
                   see source for options
 
+  perf_table [ options ] file1 file2 ...
+                - produces a tabular overview of perf data from given raw data files
+                  see source for options
+
+
 ENVIRONMENT
 
   RAILS_ROOT
@@ -131,7 +136,9 @@ INVOCATION
   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.
+  include railsbench's script directory into your seach path. In this
+  case you need to run 'sudo railsbench postinstall' to make the
+  scripts executable.
 
 
 USAGE
@@ -217,12 +224,12 @@ USAGE
   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 perf_run_gc 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
@@ -230,39 +237,64 @@ CONFIGURATION
   Benchmarks are configured through file benchmarks.yml. Example:
 
     default:
-      index, other
+      index, query, alpha
 
     index:
       uri: /test/index
       new_session: true
 
-    other:
-      -
+    query:
         uri: /test/list
-      -
+        method: post
+        post_data: search_string=tomatoes
+
+    alpha:
         uri: /test/alphabetic
-        query_params: page=7
+        query_string: page=7&letter=A
 
-  defines 3 benchmarks:
+  defines 4 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"
+    "index"    will run (/test/index) using method GET
+    "query"    will run (/test/list) using method POST
+    "alpha"    will run (/test/alphabetic) using method GET
+    "default"  will run benchmarks "index", "query" and "alpha"
 
   uri: is mandatory, query_params: and new_session: are optional.
 
   Instead of
 
       uri: /test/alphabetic
-      query_params: page=7
+      query_string: page=7
 
   one could have written
 
-      uri: /test/alphabetic?page=7
-
-  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: /test/alphabetic?page=7&letter=A
+
+  A single test session is created before running the benchmarks and
+  stored in the sesion container of your choice. The corresponding
+  _session_id value is sent with each request. If you specifiy
+  new_session: true, railsbench will not send the session_id value, so
+  Rails will create a new session per request for the given benchmark.
+
+  Session data can either be set on the benchmarker instance, or
+  specified in the benchmark config file like so:
+
+    list_user_5:
+      uri: /test/list
+      method: post
+      post_data: search_string=tomatoes
+      session_data:
+        user_id: 5
+
+  benchmarks.yml is loaded using ERB. This makes it possible to avoid
+  using primary keys in the config file:
+
+    list_user_stefan:
+      uri: /test/list
+      method: post
+      post_data: search_string=tomatoes
+      session_data:
+        user_id: <%= User.find_by_login('stefan').id %>
 
   An inital benchmark configuration file can be generated using command
   generate_benchmarks.

data/bin/railsbench

@@ -3,6 +3,7 @@
 RAILSBENCH_CMDS = %w(
 base
 generate_benchmarks
+convert_raw_data_files
 help
 install
 path
@@ -16,6 +17,7 @@ perf_plot_gc
 perf_prof
 perf_run
 perf_run_gc
+perf_table
 perf_tex
 perf_times
 perf_times_gc

data/config/benchmarks.yml

@@ -1,49 +1,2 @@
 default:
    uri: /
-
-all:
-   new_sessions, same_session
-
-new_sessions:
-   empty, welcome
-
-same_session:
-    rezept, myknzlpzl, show, cat, cat5, letter
-
-empty:
-    uri: /empty/index
-    new_session: true
-
-welcome:
-    uri: /welcome/index
-    new_session: true
-
-rezept:
-    uri: /rezept/index
-
-myknzlpzl:
-    uri: /rezept/myknzlpzl
-
-show:
-    uri: /rezept/show/713
-
-cat:
-    uri: /rezept/cat/Hauptspeise
-
-cat5:
-    uri: /rezept/cat/Hauptspeise?page=5
-
-letter:
-    uri: /rezept/letter/G
-
-links:
-  - 
-    uri: /test/url_test
-  -
-    uri: /test/link_test
-
-alpha:
-    uri: /rezept/alphabetic
-
-test_index:
-    uri: /test/index

data/install.rb

@@ -33,7 +33,7 @@ install("#{RAILSBENCH_BASE}/config/benchmarks.rb", RAILS_CONFIG, :mode => 0644)
 install("#{RAILSBENCH_BASE}/config/benchmarks.yml", RAILS_CONFIG, :mode => 0644) unless
   File.exists?(RAILS_CONFIG + "benchmarks.yml")
 
-install("#{RAILSBENCH_BASE}/config/benchmarking.rb", RAILS_ENVS, :mode => 0644) unless
+cp(RAILS_ENVS + "production.rb", RAILS_ENVS + "benchmarking.rb") unless
   File.exists?(RAILS_ENVS + "benchmarking.rb")
 
 database = YAML::load(File.open(RAILS_CONFIG + "database.yml"))
@@ -41,8 +41,8 @@ unless database["benchmarking"]
   puts "creating database configuration: benchmarking"
   File.open(RAILS_CONFIG + "database.yml", "ab") do |file|
     file.puts "\nbenchmarking:\n"
-    %w(adapter database host username password).each do |k|
-      file.puts "  #{k}: #{database['development'][k]}"
+    database['development'].each do |k, v|
+      file.puts "  #{k}: #{v}"
     end
   end
 end
@@ -53,7 +53,7 @@ __END__
 ### mode:ruby ***
 ### 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/benchmark_specs.rb

@@ -0,0 +1,63 @@
+require 'delegate'
+require 'yaml'
+require 'erb'
+
+class BenchmarkSpec < DelegateClass(Hash)
+  attr_accessor :name
+
+  READERS = %w(uri method post_data query_string new_session action controller session_data)
+  READERS.each do |method|
+    define_method(method) { self[method] }
+  end
+
+  def initialize(name, hash)
+    super(hash)
+    @name = name
+  end
+
+  def inspect
+    "BenchmarkSpec(#{name},#{super})"
+  end
+
+  class << self
+    def load(name, file_name = nil)
+      unless file_name
+        file_name = ENV['RAILS_ROOT'] + "/config/benchmarks.yml"
+      end
+      @@specs = YAML::load(ERB.new(IO.read(file_name)).result)
+      raise "There is no benchmark named '#{name}'" unless @@specs[name]
+      parse(@@specs, name)
+    end
+
+    def parse(specs, name)
+      spec = specs[name]
+      if spec.is_a?(String)
+        spec.split(/, */).collect!{ |n| parse(specs, n) }.flatten
+      elsif spec.is_a?(Hash)
+        [ BenchmarkSpec.new(name,spec) ]
+      elsif spec.is_a?(Array)
+        spec.collect{|n| parse(specs, n)}.flatten
+      else
+        raise "oops: unknown entry type in benchmark specification"
+      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

data/lib/railsbench/railsbenchmark.rb

@@ -1,6 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + '/benchmark_specs')
+
 class RailsBenchmark
 
-  attr_accessor :gc_frequency, :iterations, :url_spec
+  attr_accessor :gc_frequency, :iterations
   attr_accessor :http_host, :remote_addr, :server_port
   attr_accessor :relative_url_root
   attr_accessor :perform_caching, :cache_template_loading
@@ -34,8 +36,6 @@ class RailsBenchmark
 
     @session_data = options[:session_data] || {}
 
-    @url_spec = options[:url_spec]
-
     ENV['RAILS_ENV'] = 'benchmarking'
 
     require ENV['RAILS_ROOT'] + "/config/environment"
@@ -56,6 +56,13 @@ class RailsBenchmark
       end
     end_eval
 
+    # make sure Rails doesn't try to read post data from stdin
+    CGI::QueryExtension.module_eval <<-end_eval
+      def read_body(content_length)
+        ENV['RAW_POST_DATA']
+      end
+    end_eval
+
     if ARGV.include?('-path')
       $:.each{|f| STDERR.puts f}
       exit
@@ -108,6 +115,14 @@ class RailsBenchmark
     @session_id = @session.session_id
   end
 
+  def update_test_session_data(session_data)
+    dbman = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager]
+    old_session_data = dbman.new(@session).restore
+    new_session_data = old_session_data.merge(session_data || {})
+    new_session_data.each{ |k,v| @session[k] = v }
+    @session.update
+  end
+
   def delete_test_session
     @session.delete
     @session = nil
@@ -118,30 +133,42 @@ class RailsBenchmark
   end
 
   def setup_test_urls(name)
-    raise "There is no benchmark named '#{name}'" unless @url_spec[name]
-    @urls = self.class.parse_url_spec(@url_spec, name)
+    @urls = BenchmarkSpec.load(name)
   end
 
   def setup_initial_env
     ENV['REMOTE_ADDR'] = remote_addr
     ENV['HTTP_HOST'] = http_host
     ENV['SERVER_PORT'] = server_port.to_s
-    ENV['REQUEST_METHOD'] = 'GET'
   end
 
-  def setup_request_env(uri, query_string, new_session)
-    ENV['REQUEST_URI'] = @relative_url_root + uri
-    ENV['QUERY_STRING'] = query_string || ''
-    ENV['CONTENT_LENGTH'] = (query_string || '').length.to_s
-    ENV['HTTP_COOKIE'] = new_session ? '' : "_session_id=#{@session_id}"
+  def setup_request_env(entry)
+    ENV['REQUEST_URI'] = @relative_url_root + entry.uri
+    ENV['RAW_POST_DATA'] = nil
+    ENV['QUERY_STRING'] = nil
+    case ENV['REQUEST_METHOD'] = (entry.method || 'get').upcase
+    when 'GET'
+      query_data = escape_data(entry.query_string || '')
+      ENV['QUERY_STRING'] = query_data
+    when 'POST'
+      query_data = escape_data(entry.post_data || '')
+      ENV['RAW_POST_DATA'] = query_data
+    end
+    ENV['CONTENT_LENGTH'] = query_data.length.to_s
+    ENV['HTTP_COOKIE'] = entry.new_session ? '' : "_session_id=#{@session_id}"
+    update_test_session_data(entry.session_data) unless entry.new_session
+  end
+
+  def escape_data(str)
+    str.split('&').map{|e| e.split('=').map{|e| CGI::escape e}.join('=')}.join('&')
   end
 
   def warmup
     error_exit "No urls given for performance test" unless @urls && @urls.size>0
     setup_initial_env
     @urls.each do |entry|
-      error_exit "No uri given for benchmark entry: #{entry.inspect}" unless entry['uri']
-      setup_request_env(entry['uri'], entry['query_string'], entry['new_session'])
+      error_exit "No uri given for benchmark entry: #{entry.inspect}" unless entry.uri
+      setup_request_env(entry)
       Dispatcher.dispatch
     end
   end
@@ -242,7 +269,7 @@ class RailsBenchmark
 
   def run_urls_without_benchmark_but_with_gc_control(urls, n, gc_frequency)
     urls.each do |entry|
-      setup_request_env(entry['uri'], entry['query_string'], entry['new_session'])
+      setup_request_env(entry)
       GC.enable; GC.start; GC.disable
       request_count = 0
       n.times do
@@ -257,7 +284,7 @@ class RailsBenchmark
 
   def run_urls_without_benchmark_and_without_gc_control(urls, n)
     urls.each do |entry|
-      setup_request_env(entry['uri'], entry['query_string'], entry['new_session'])
+      setup_request_env(entry)
       n.times do
         Dispatcher.dispatch
       end
@@ -269,8 +296,8 @@ class RailsBenchmark
     GC.clear_stats if gc_stats
     urls.each do |entry|
       request_count = 0
-      setup_request_env(entry['uri'], entry['query_string'], entry['new_session'])
-      test.report(entry['uri']) do
+      setup_request_env(entry)
+      test.report(entry.name) do
         GC.disable_stats if gc_stats
         GC.enable; GC.start; GC.disable
         GC.enable_stats  if gc_stats
@@ -294,11 +321,11 @@ class RailsBenchmark
     gc_stats = patched_gc?
     GC.clear_stats if gc_stats
     urls.each do |entry|
-      setup_request_env(entry['uri'], entry['query_string'], entry['new_session'])
+      setup_request_env(entry)
       GC.disable_stats if gc_stats
       GC.start
       GC.enable_stats  if gc_stats
-      test.report(entry['uri']) do
+      test.report(entry.name) do
         n.times do
           Dispatcher.dispatch
         end
@@ -320,7 +347,7 @@ class RailsBenchmark
     test.report("url_mix (#{urls.length} urls)") do
       n.times do
         urls.each do |entry|
-          setup_request_env(entry['uri'], entry['query_string'], entry['new_session'])
+          setup_request_env(entry)
           Dispatcher.dispatch
         end
       end
@@ -342,7 +369,7 @@ class RailsBenchmark
       request_count = 0
       n.times do
         urls.each do |entry|
-          setup_request_env(entry['uri'], entry['query_string'], entry['new_session'])
+          setup_request_env(entry)
           Dispatcher.dispatch
           if (request_count += 1) == gc_frequency
             GC.enable; GC.start; GC.disable
@@ -357,17 +384,6 @@ class RailsBenchmark
       GC.clear_stats
     end
   end
-
-  def self.parse_url_spec(url_spec, name)
-    res = url_spec[name]
-    if res.is_a?(String)
-      res = res.split(/, */).collect!{ |n| parse_url_spec(url_spec, n) }.flatten
-    elsif res.is_a?(Hash)
-      res = [ res ]
-    end
-    res
-  end
-
 end
 
 

data/lib/railsbench/version.rb

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

data/script/convert_raw_data_files

@@ -0,0 +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

data/script/generate_benchmarks

@@ -50,8 +50,8 @@ def dump_entry(name, entry, io = $stdout)
   end
 end
 
-if defined? ActionController::CodeGeneration
-  $stderr.puts "this Rails version is not supported. please upgrade to a 1.2 variety."
+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."
   exit 1
 end
 

data/script/perf_bench

@@ -34,12 +34,10 @@ bm(32) do |test|
     exit!(-1)
   end
 
-  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

data/script/perf_comp

@@ -110,7 +110,7 @@ if pi[0].gc_stats? && pi[1].gc_stats?
   t1 = pi[0].gc_time_mean
   c2 = pi[1].gc_calls_mean
   t2 = pi[1].gc_time_mean
-  factor = (c1-c2==0) ? 1 : c1/c2
+  factor = (t1-t2==0) ? 1 : t1/t2
 
   if narrow
     printf "\n%-4s %9s %9s %7s %7s %8s %8s %6s\n",

data/script/perf_diff

@@ -27,7 +27,7 @@ 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}")
+system("ruby #{bindir}/perf_comp #{file1} #{file2}")
 
 __END__
 

data/script/perf_html

@@ -11,6 +11,12 @@ puts <<'END'
 .c1 { background:#fff3df; }
 .c2 { background:#dfedff; }
 .factor { background:#efe0ef; }
+.factor_red_alert { background:#CC303B; }
+.factor_red { background:#FF6060; }
+.factor_reddish { background:#FFA766; }
+.factor_green_alert { background:#0B8900; }
+.factor_green { background:#6AB788; }
+.factor_greenish { background:#7FFFB0; }
 .name { background:#dfdfdf; }
 .perf_name   { text-align:left;   }
 .perf_data   { text-align:right;  }
@@ -19,6 +25,25 @@ puts <<'END'
 END
 end
 
+def factor_class(v)
+  return 'factor' unless ARGV.include?('-colorize')
+  if v <= 0.85
+    'factor_red_alert'
+  elsif v <= 0.90
+    'factor_red'
+  elsif v <= 0.95
+    'factor_reddish'
+  elsif v >= 1.15
+    'factor_green_alert'
+  elsif v >= 1.10
+    'factor_green'
+  elsif v >= 1.05
+    'factor_greenish'
+  else
+    'factor'
+  end
+end
+
 unless ARGV.include?('-notable')
   puts "<table cellspacing=1px>"
   $stdin.each_line do |l|
@@ -46,13 +71,13 @@ unless ARGV.include?('-notable')
       puts "</tr>"
     end
     case l
-    when %r{^([A-Za-z0-9./?= ]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+$}
+    when %r{^([A-Za-z0-9./?=_ ]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+([\d.]+)\s+$}
       puts "<tr>"
       puts "<td class='perf_name name#{" i" if $1.strip == "all requests"}'>#{$1}</td>"
       puts "<td class='perf_data c1'>#{$2}</td><td class='perf_data c2'>#{$3}</td>"
       puts "<td class='perf_data c1'>#{$4}</td><td class='perf_data c2'>#{$5}</td>"
       puts "<td class='perf_data c1'>#{$6}</td><td class='perf_data c2'>#{$7}</td>"
-      puts "<td class='perf_data factor'>#{$8}</td>"
+      puts "<td class='perf_data #{factor_class($8.to_f)}'>#{$8}</td>"
       puts "</tr>"
     end
   end

data/script/perf_plot

@@ -15,7 +15,11 @@ names = []
 labels = []
 perf_data = []
 graph_type = Gruff::Line
-graph_width = 800
+graph_width = '800x600'
+font_size = 14
+output_file = "graph.png"
+colors = nil
+theme = nil
 
 ARGV.each do |arg|
   case arg
@@ -29,18 +33,29 @@ ARGV.each do |arg|
     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)
+    names[files.length-1] ||= File.basename(arg).sub(/\.txt$/, '').sub(/^\d\d-\d\d\.[^\.]+./, '')
   end
 end
 
 files.length > 0 or die "usage: perf_plot [options] file1 file2 ..."
 
+pi = nil
 files.each do |file|
   pi = PerfInfo.new(file)
   iter = pi.iterations
@@ -51,9 +66,7 @@ end
 
 selection = (1..(perf_data.last.length)).to_a if selection.empty?
 if labels.empty?
-  labels = selection.map{|i| i.to_s}.index_map
-else
-  labels = labels.index_map
+  labels = pi.keys.restrict_to(selection.map{|i| i-1})
 end
 perf_data = perf_data.map{|d| d.restrict_to(selection.map{|i| i-1})}
 
@@ -62,13 +75,18 @@ perf_data = perf_data.map{|d| d.restrict_to(selection.map{|i| i-1})}
 # 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
+g.labels = labels.index_map
 perf_data.each_with_index{|d,i| g.data(names[i], d)}
-g.write
+g.write(output_file)
 
 
 __END__

data/script/perf_plot_gc

@@ -15,7 +15,8 @@ names = []
 labels = %w()
 perf_data = []
 graph_type = Gruff::StackedBar
-graph_width = 1400
+graph_width = '1400x1050'
+font_size = 14
 ignored_object_types = %w(NODE STRING)
 
 ARGV.each do |arg|
@@ -26,10 +27,14 @@ ARGV.each do |arg|
 #     graph_type = Gruff::Bar
   when /^-width=(\d+)$/
     graph_width = $1.to_i
+  when /^-geometry=(\d+x\d+)$/
+    graph_width = $1
 #   when /^-title=(.*)$/
 #     title = $1 unless $1.strip.empty?
 #   when /^-names=(.+)$/
 #     names = $1.split(',')
+  when /^-font_size=(\d+)$/
+    font_size = $1.to_i
   when /^-ignore=(.*)$/
     ignored_object_types = $1.split(',').map(&:upcase)
   else
@@ -65,9 +70,9 @@ end
 
 g.title = title
 g.sort = false
-g.legend_font_size = 8
-g.legend_box_size = 8
-g.marker_font_size = 8
+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 = gc_max_processed
 g.labels = Hash[* (0...gc_count_max).map{|i| [2*i, i.to_s]}.flatten ]

data/script/perf_table

@@ -0,0 +1,104 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
+require 'railsbench/perf_info'
+
+# extract options
+
+selection = []
+title = "Performance Graph"
+files = []
+names = []
+labels = []
+perf_data = []
+font_size = 14
+output_file = "graph.png"
+colors = nil
+
+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 /^-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 << File.basename(arg).sub(/\.txt$/, '').sub(/^\d\d-\d\d\.[^\.]+./, '')
+  end
+end
+
+files.length > 0 or die "usage: perf_table [options] file1 file2 ..."
+
+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
+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})
+end
+perf_data = perf_data.map{|d| d.restrict_to(selection.map{|i| i-1})}
+
+#puts selection.inspect
+#puts labels.length
+#puts labels.inspect
+#puts perf_data.length
+#puts perf_data.inspect
+#puts names.inspect 
+
+# puts labels.zip(perf_data).inspect
+puts "<table border=1>"
+puts "<tr><td></td>"
+labels.each{|l| puts "<th>#{l}</th>"}
+puts "</tr>"
+names.zip(perf_data).each do |row|
+  puts "<tr>"
+  puts "<th align='left'>#{row.first}</th>"
+  row.last.each do |cell|
+    puts "<td align='right'>#{sprintf "%6.2f", cell}</td>"
+  end
+  puts "</tr>"
+end
+puts "</table>"
+
+
+__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/run_urls

@@ -23,12 +23,10 @@ trap("INT") do
   exit!(-1)
 end
 
-benchmarks = YAML::load(File.open(ENV['RAILS_ROOT'] + "/config/benchmarks.yml"))
 benchmark_name = "default"
 ARGV.each{ |arg| benchmark_name = $1 if arg =~ /-bm=([^ ]+)/ }
 
 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?('-warmup')

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: railsbench
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
-date: 2007-01-14 00:00:00 +01:00
+  version: 0.9.2
+date: 2007-04-01 00:00:00 +02:00
 summary: rails benchmarking tools
 require_paths: 
 - lib
@@ -36,6 +36,7 @@ files:
 - postinstall.rb
 - LICENSE
 - Manifest.txt
+- PROBLEMS
 - README
 - Rakefile
 - setup.rb
@@ -48,8 +49,10 @@ files:
 - lib/railsbench/perf_utils.rb
 - lib/railsbench/write_headers_only.rb
 - lib/railsbench/railsbenchmark.rb
+- lib/railsbench/benchmark_specs.rb
 - lib/benchmark.rb
 - script/generate_benchmarks
+- script/convert_raw_data_files
 - script/perf_bench
 - script/perf_comp
 - script/perf_comp_gc
@@ -61,6 +64,7 @@ files:
 - script/perf_prof
 - script/perf_run
 - script/perf_run_gc
+- script/perf_table
 - script/perf_tex
 - script/perf_times
 - script/perf_times_gc
@@ -88,5 +92,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.6
+        version: 1.2.0
     version: