skaes-railsbench 0.9.5 → 0.9.6

data/README

@@ -103,6 +103,13 @@ FILES
                   store profile data in a HTML file in directory $RAILS_PERF_DATA
                   file name is computed from date and benchmark name as described above
                   but has a .html extension instead of .txt
+                - a number of options to steer ruby-prof are available:
+                    -ruby_prof=number[/number]
+                      sets threshold and min_percent for ruby-prof (defaults to 0.1/1)
+                    -profile_type=stack|grind|flat|graph|multi
+                      selects the profile format (defaults to stack)
+                    -measure_mode=process_time|wall_time|cpu_time|allocations|memory
+                      selects what to measure (default to wall_time)
 
   perf_plot [ options ] file1 file2 ...
                 - plot performance data from raw performance files using gruff or gnuplot

data/lib/railsbench/railsbenchmark.rb

@@ -50,12 +50,15 @@ class RailsBenchmark
       require 'dispatcher' # make edge rails happy
 
       if Rails::VERSION::STRING >= "2.3"
+        @rack_middleware = true
         require 'cgi/session'
         CGI.class_eval <<-"end_eval"
           def env_table
             @env_table ||= ENV.to_hash
           end
         end_eval
+      else
+         @rack_middleware = false
       end
 
     rescue => e
@@ -155,9 +158,8 @@ class RailsBenchmark
   end
 
   def establish_test_session
-    if Rails::VERSION::STRING >= "2.3"
+    if @rack_middleware
       session_options = ActionController::Base.session_options
-      # puts "the options: #{session_options.inspect}"
       @session_id = ActiveSupport::SecureRandom.hex(16)
       do_not_do_much = lambda do |env|
         env["rack.session"] = @session_data
@@ -177,15 +179,7 @@ class RailsBenchmark
   end
 
   def update_test_session_data(session_data)
-    # puts  ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS.inspect
-    dbman = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager]
-    if dbman # before rails 2.3
-      old_session_data = dbman.new(@session).restore
-      # $stderr.puts old_session_data.inspect
-      new_session_data = old_session_data.merge(session_data || {})
-      new_session_data.each{ |k,v| @session[k] = v }
-      @session.update
-    else
+    if @rack_middleware
       session_options = ActionController::Base.session_options
       merge_url_specific_session_data = lambda do |env|
         old_session_data = env["rack.session"]
@@ -200,6 +194,13 @@ class RailsBenchmark
       env["HTTP_COOKIE"] = cookie
       # debugger
       @session_store.call(env)
+    else
+      dbman = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager]
+      old_session_data = dbman.new(@session).restore
+      # $stderr.puts old_session_data.inspect
+      new_session_data = old_session_data.merge(session_data || {})
+      new_session_data.each{ |k,v| @session[k] = v }
+      @session.update
     end
   end
 
@@ -295,7 +296,16 @@ class RailsBenchmark
           $stderr = File.open(benchmark_file, "w")
         end
         require 'ruby-prof'
-        RubyProf.measure_mode = RubyProf::WALL_TIME
+        measure_mode = "WALL_TIME"
+        ARGV.each{|arg| measure_mode=$1.upcase if arg =~ /-measure_mode=([^ ]*)/ }
+        if %w(PROCESS_TIME WALL_TIME CPU_TIME ALLOCATIONS MEMORY).include?(measure_mode)
+          RubyProf.measure_mode = RubyProf.const_get measure_mode
+          GC.eanable_stats if measure_mode == "memory"
+        else
+          $stderr = STDERR
+          $stderr.puts "unsupported ruby_prof measure mode: #{measure_mode}"
+          exit(-1)
+        end
         RubyProf.start
       end
     rescue LoadError
@@ -540,7 +550,7 @@ class RailsBenchmarkWithActiveRecordStore < RailsBenchmark
 
   def initialize(options={})
     super(options)
-    @session_class = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager].session_class rescue CGI::Session::ActiveRecordStore
+    @session_class = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager].session_class rescue CGI::Session::ActiveRecordStore rescue ActiveRecord::SessionStore
   end
 
   def delete_new_test_sessions

data/lib/railsbench/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: skaes-railsbench
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-25 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: railsbench
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.12.2
     version: 
 description: rails benchmarking tools
 email: skaes@railsexpress.de
@@ -87,6 +87,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://railsbench.rubyforge.org
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -108,9 +109,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: railsbench
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: rails benchmarking tools
 test_files: 
 - test/railsbench_test.rb