benchmark/app.rb benchmark/servers/ebb.rb benchmark/servers/mongrel.rb benchmark/servers/thin-turbo.rb benchmark/servers/thin.rb script/app.ru script/start tasks/gem.rake @@ -10,13 +10,12 @@ New and ultra-turbo-crazy-fast backend for Thin === Usage - thin start -rthin-turbo -BThin::Backends::Turbo + thin start -r lib/thin-turbo -b Thin::Backends::Turbo ... === License Ruby License, http://www.ruby-lang.org/en/LICENSE.txt. === Credits - Thin is copyright Marc-Andre Cournoyer <macournoyer@gmail.com> Get help at http://groups.google.com/group/thin-ruby/ README @@ -1,6 +1,7 @@ RUBY_1_9 = RUBY_VERSION =~ /^1\.9/ WIN = (RUBY_PLATFORM =~ /mswin|cygwin/) SUDO = (WIN ? "" : "sudo") +THIN_TURBO_VERSION = '0.1.0' require 'rake' require 'rake/clean' Rakefile @@ -1,14 +1,12 @@ require 'rubygems' -require 'rack' class Benchmarker PORT = 7000 ADDRESS = '0.0.0.0' TMP_POST_FILE = "/tmp/bench-post-file" - SERVERS = %w(Mongrel EMongrel Ebb Thin Thin-Turbo) + SERVERS = %w(mongrel ebb thin thin-turbo) def initialize(method, range, options={}) - @app = App.new @method = method @range = range @@ -47,28 +45,9 @@ class Benchmarker end private - def start_server(handler_name) + def start_server(name) @server = fork do - [STDOUT, STDERR].each { |o| o.reopen "/dev/null" } - - case handler_name - when 'EMongrel' - require 'swiftcore/evented_mongrel' - Rack::Handler::Mongrel.run @app, :Host => ADDRESS, :Port => PORT - when 'Thin' - require 'thin' - Rack::Handler::Thin.run @app, :Host => ADDRESS, :Port => PORT - when 'Thin-Turbo' - require File.dirname(__FILE__) + "/../lib/thin-turbo" - b = Thin::Backend.new(ADDRESS, PORT, @app) - b.start - when 'Ebb' - require 'ebb' - Ebb.start_server(@app, :threaded_processing => false, :port => PORT) - else - handler = Rack::Handler.const_get(handler_name) - handler.run @app, :Host => ADDRESS, :Port => PORT - end + exec "ruby #{File.dirname(__FILE__)}/servers/#{name}.rb" end sleep 2 @@ -136,27 +115,3 @@ class Benchmarker [total, virtual, real] end end - -class App - MIN_SIZE = 1024 - - def initialize - @calls = 0 - end - - def call(env) - status = 200 - body = [] - request = Rack::Request.new(env) - @calls += 1 - - sleep request.params['wait'].to_i if request.params['wait'] && @calls % 10 == 0 - - body << 'X' * (request.params['size'] || MIN_SIZE).to_i - body << "\r\n" - - headers = { 'Content-Type' => 'text/plain', 'Content-Length' => body.join.size.to_s } - - [status, headers, body] - end -end benchmark/benchmarker.rb @@ -4,7 +4,7 @@ require 'optparse' MB = 1024 ** 2 CONCURRENCY_RANGE = [1, 10, 50] -FILE_RANGE = [1 * MB, 5 * MB, 10 * MB] +FILE_RANGE = [1 * MB] #, 5 * MB , 10 * MB] options = { :keep_alive => false, @@ -15,7 +15,8 @@ method = ARGV[0].to_sym OptionParser.new do |opts| opts.banner = "Usage: #{$0} (concurrency|upload|download) [options]" - opts.on("-r", "--range", "Range used to run benchmark") { |r| range = eval("[#{r}]") } + opts.on("-n NUM", "--requests", "Number of requests") { |n| options[:requests] = n } + opts.on("-r EVAL", "--range", "Range used to run benchmark") { |r| range = eval("[#{r}]") } opts.on("-k", "--keep-alive", "Use persistent connections") { options[:keep_alive] = true } opts.on_tail("-h", "--help", "Show this message") { puts opts; exit } benchmark/run @@ -31,29 +31,30 @@ static void backend_accept_cb(EV_P_ struct ev_io *watcher, int revents) /* public api */ -VALUE backend_init(VALUE self, VALUE address, VALUE port, VALUE app) +VALUE backend_set_app(VALUE self, VALUE app) { backend_t *backend = NULL; DATA_GET(self, backend_t, backend); - - backend->address = RSTRING_PTR(address); - backend->port = FIX2INT(port); - backend->app = app; - - backend->local_addr.sin_family = AF_INET; - backend->local_addr.sin_port = htons(backend->port); - backend->local_addr.sin_addr.s_addr = inet_addr(backend->address); - backend->loop = ev_default_loop(0); + backend->app = app; - return self; + return app; } -VALUE backend_listen(VALUE self) +VALUE backend_listen_on_port(VALUE self, VALUE address, VALUE port) { backend_t *backend = NULL; DATA_GET(self, backend_t, backend); int sock_flags; + + backend->address = RSTRING_PTR(address); + backend->port = FIX2INT(port); + + backend->local_addr.sin_family = AF_INET; + backend->local_addr.sin_port = htons(backend->port); + backend->local_addr.sin_addr.s_addr = inet_addr(backend->address); + + backend->loop = ev_default_loop(0); if ((backend->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) rb_sys_fail("socket"); @@ -95,9 +96,11 @@ VALUE backend_close(VALUE self) backend_t *backend = NULL; DATA_GET(self, backend_t, backend); - backend->open = 0; - ev_io_stop(backend->loop, &backend->accept_watcher); - close(backend->fd); + if (backend->open) { + backend->open = 0; + ev_io_stop(backend->loop, &backend->accept_watcher); + close(backend->fd); + } return Qtrue; } @@ -129,12 +132,12 @@ VALUE backend_alloc(VALUE klass) void backend_define(void) { /* Plug our C stuff into the Ruby world */ - VALUE mThin = rb_define_module("Thin"); - VALUE cBackend = rb_define_class_under(mThin, "Backend", rb_cObject); + VALUE mThin = rb_define_module_under(rb_define_module("Thin"), "Backends"); + VALUE cBackend = rb_define_class_under(mThin, "Turbo", rb_cObject); rb_define_alloc_func(cBackend, backend_alloc); - rb_define_method(cBackend, "initialize", backend_init, 3); - rb_define_protected_method(cBackend, "listen", backend_listen, 0); + rb_define_method(cBackend, "app=", backend_set_app, 1); + rb_define_protected_method(cBackend, "listen_on_port", backend_listen_on_port, 2); rb_define_protected_method(cBackend, "loop!", backend_loop, 0); rb_define_protected_method(cBackend, "close", backend_close, 0); } ext/thin_backend/backend.c @@ -1,3 +1,4 @@ +require 'rubygems' require 'thin_backend' class Thin::Backend ext/thin_backend/test.rb @@ -1,4 +1,5 @@ require 'rubygems' require 'thin' -require File.dirname(__FILE__) + "/thin/backends/turbo" \ No newline at end of file +require File.dirname(__FILE__) + "/../ext/thin_backend/thin_backend" +require File.dirname(__FILE__) + "/thin/backends/turbo" lib/thin-turbo.rb @@ -1,26 +1,71 @@ -require 'thin_backend' - module Thin - class Backend - def start - listen - puts 'Listening on 0.0.0.0:4000' - - trap('INT') { stop } + module Backends + class Turbo + # Server serving the connections throught the backend + attr_accessor :server + + # Address and port on which the server is listening for connections. + attr_accessor :host, :port + + # Maximum time for incoming data to arrive + attr_accessor :timeout + + # Maximum number of file or socket descriptors that the server may open. + attr_accessor :maximum_connections + + # Maximum number of connections that can be persistent + attr_accessor :maximum_persistent_connections + + # Allow using threads in the backend. + attr_writer :threaded + def threaded?; @threaded end + + # Number of persistent connections currently opened + attr_accessor :persistent_connection_count + + def initialize(host, port, options={}) + @host = host + @port = port.to_i + end + + def start + self.app = @server.app + listen_on_port(@host, @port) - @running = true - loop! while @running - close - end - - def stop - puts 'Stopping ...' - @running = false - end + @running = true + loop! while @running + close + end - def log_error(ex=$!) - puts "!! Unexpected error while processing request: #{ex.message}" - puts ex.backtrace.join("\n") if ex.backtrace + def stop + @running = false + end + alias :stop! :stop + + def config + end + + def running? + @running + end + + def empty? + false # TODO + end + + def size + 0 # TODO + end + + def to_s + "#{@host}:#{@port} (turbo)" + end + + protected + def log_error(ex=$!) + puts "!! Unexpected error while processing request: #{ex.message}" + puts ex.backtrace.join("\n") if ex.backtrace + end end end -end \ No newline at end of file +end lib/thin/backends/turbo.rb @@ -23,7 +23,7 @@ def ext_task(name) cd ext_dir do sh(WIN ? 'nmake' : 'make') end - cp ext_bundle, 'lib/' + # cp ext_bundle, 'lib/' end end tasks/ext.rake tasks/stats.rake 07afc6a61a74045dbf715180c7d9fc602e9db676 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin-turbo/commit/4caece803a6309f6377248865d874fc51dedaaba 4caece803a6309f6377248865d874fc51dedaaba 2008-04-09T19:26:24-07:00 2008-04-09T19:26:24-07:00 Fully working as a Thin backend. Do not fork to start servers in benchmark, split in script. a0831970f62e77bf705b9ce6f1badfc34002ae4f macournoyer macournoyer@gmail.com