@@ -1,3 +1,5 @@ +require 'rack/lobster' + class Benchmarker PORT = 7000 ADDRESS = '0.0.0.0' @@ -5,7 +7,7 @@ class Benchmarker attr_accessor :requests, :concurrencies, :servers, :keep_alive def initialize - @servers = %w(WEBrick Mongrel EMongrel Thin) + @servers = %w(Mongrel EMongrel Thin) @requests = 1000 @concurrencies = [1, 10, 100] end benchmark/benchmarker.rb @@ -49,13 +49,14 @@ when :table when :graph require '/usr/local/lib/ruby/gems/1.8/gems/gruff-0.2.9/lib/gruff' g = Gruff::Area.new - g.title = "Server benchmark (#{options[:requests]} requests" - g.title << ', w/ Keep-Alive' if options[:keep_alive] - g.title << ')' + g.title = "#{options[:requests]} requests" + g.title << ' w/ Keep-Alive' if options[:keep_alive] - g.x_axis_label = 'Concurrency' - g.y_axis_label = 'Requests / sec' - g.labels = {} + g.x_axis_label = 'Concurrency' + g.y_axis_label = 'Requests / sec' + g.maximum_value = 0 + g.minimum_value = 0 + g.labels = {} b.concurrencies.each_with_index { |c, i| g.labels[i] = c.to_s } results = {} @@ -65,7 +66,7 @@ when :graph results[server] ||= [] results[server] << req_sec end - + b.run! puts benchmark/runner @@ -52,9 +52,9 @@ module Thin # If no more request on that same connection, we close it. close_connection_after_writing unless persistent? - rescue Object => e - log "Unexpected error while processing request: #{e.message}" - log_error e + rescue + log "Unexpected error while processing request: #{$!.message}" + log_error close_connection rescue nil ensure @request.close rescue nil @@ -77,18 +77,15 @@ module Thin @response.persistent? end + # IP Address of the remote client. def remote_address - @request.forwarded_for || (has_peername? ? socket_address : nil) + @request.forwarded_for || socket_address rescue - log_error($!) + log_error nil end protected - def has_peername? - !get_peername.nil? && !get_peername.empty? - end - def socket_address Socket.unpack_sockaddr_in(get_peername)[1] end lib/thin/connection.rb @@ -42,7 +42,7 @@ module Thin end # Log an error backtrace if debugging is activated - def log_error(e) + def log_error(e=$!) debug "#{e}\n\t" + e.backtrace.join("\n\t") end end lib/thin/logging.rb @@ -3,10 +3,19 @@ # Takes the same arguments as the thin script. require 'rubygems' require 'ruby-prof' +require File.dirname(__FILE__) + '/../lib/thin' + +class Adapter + def call(env) + [200, {'Content-Type' => 'text/html', 'Content-Length' => '11'}, ['hello world']] + end +end # Profile the code result = RubyProf.profile do - load 'bin/thin' + Thin::Server.start('0.0.0.0', 3000) do + run Adapter.new + end end # Print a graph profile to text script/profile 18296dabdb4cf8a5c419c54639958a35da06e270 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/dd6b82a8c65debd437158c26aae5dde340a2d7a7 dd6b82a8c65debd437158c26aae5dde340a2d7a7 2008-02-16T20:03:40-08:00 2008-02-16T20:03:40-08:00 Optimize Connection#remote_address for non-failures. Couple fix in benchmark script. Fix profile script to profile only Thin server. 11f9535036dd659338ac29200fef65647f6079f7 macournoyer macournoyer@gmail.com