benchmark/bench benchmark/cgi/fcgi-rack.rb benchmark/cgi/lighttpd.conf benchmark/cgi/scgi-rack.rb benchmark/cgi/start_lighttpd.sh benchmark/results @@ -21,7 +21,8 @@ class SimpleApp end def call(env) - commands = env['PATH_INFO'].split('/') + path = env['PATH_INFO'] || env['REQUEST_URI'] + commands = path.split('/') @count += 1 if commands.include?('periodical_activity') and @count % 10 != 1 @@ -73,9 +74,6 @@ end if $0 == __FILE__ - require 'rubygems' - require 'ruby-debug' - Debugger.start require DIR + '/../ruby_lib/ebb' server = Ebb::start_server(SimpleApp.new, :port => 4001) -end \ No newline at end of file +end benchmark/application.rb @@ -173,6 +173,9 @@ class ServerTest return nil unless r =~ /Requests per second:\s*(\d+\.\d\d)/ rps = $1.to_f + if r =~ /Time taken for tests:\s*(\d+\.\d+) seconds/ + time_taken = $1.to_f + end if r =~ /Complete requests:\s*(\d+)/ requests_completed = $1.to_i end @@ -181,11 +184,14 @@ class ServerTest else raise "didn't get how many failed requests from ab" end - puts " #{rps} req/sec (#{requests_completed} completed, #{failed_requests} failed)" + successful_requests = requests_completed - failed_requests + puts " #{rps} req/sec (#{requests_completed} total, #{failed_requests} failed in #{"%.2f" % time_taken} seconds)" + puts " #{"%.2f" % (successful_requests/time_taken)} successful req/sec" { :server => @name, :rps => rps, + :time_taken => time_taken, :requests_completed => requests_completed, :requests_failed => failed_requests, :ab_cmd => cmd benchmark/server_test.rb @@ -5,8 +5,6 @@ require 'net/http' require 'socket' require 'rubygems' require 'json' -require 'ruby-debug' -Debugger.start Ebb.log = File.open('/dev/null','w') test/helper.rb benchmark/bench_results.rb benchmark/server_bench 9b659b2e0f56a35f1ab0fd1f9e4508eb9ab9adf8 Ryan Dahl ry@lakshmi.local http://github.com/ry/ebb/commit/cebd9c9cba0549bc78c1459f85e8ea3eb6330771 cebd9c9cba0549bc78c1459f85e8ea3eb6330771 2008-03-20T09:51:55-07:00 2008-03-20T09:51:55-07:00 add fcgi-rack script for benchmarking d980e69a61ce022b311bf60d5db844a3d4bc3856 Ryan Dahl ry@lakshmi.local