lib/mongrel/semaphore.rb test/test_suite.rb test/unit/test_semaphore.rb test/unit/test_threading.rb @@ -31,6 +31,7 @@ module Mongrel ['-l', '--log FILE', "Where to write log messages", :@log_file, "log/mongrel.log"], ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"], ['-n', '--num-processors INT', "Number of processors active before clients denied", :@num_processors, 1024], + ['-N', '--num-threads INT', "Maximum number of requests to process concurrently", :@max_concurrent_threads, 1024], ['-o', '--timeout TIME', "Time to wait (in seconds) before killing a stalled thread", :@timeout, 60], ['-t', '--throttle TIME', "Time to pause (in hundredths of a second) between accepting clients", :@throttle, 0], ['-m', '--mime PATH', "A YAML file that lists additional MIME types", :@mime_map, nil], @@ -181,7 +182,7 @@ module Mongrel def config_keys @config_keys ||= - %w(address host port cwd log_file pid_file environment docroot mime_map daemon debug includes config_script num_processors timeout throttle user group prefix) + %w(address host port cwd log_file pid_file environment docroot mime_map daemon debug includes config_script num_processors timeout throttle user group prefix max_concurrent_threads) end def settings bin/mongrel_rails @@ -28,6 +28,7 @@ require 'mongrel/const' require 'mongrel/http_request' require 'mongrel/header_out' require 'mongrel/http_response' +require 'mongrel/semaphore' # Mongrel module containing all of the classes (include C extensions) for running # a Mongrel web server. It contains a minimalist HTTP server with just enough @@ -87,7 +88,8 @@ module Mongrel # The throttle parameter is a sleep timeout (in hundredths of a second) that is placed between # socket.accept calls in order to give the server a cheap throttle time. It defaults to 0 and # actually if it is 0 then the sleep is not done at all. - def initialize(host, port, num_processors=950, throttle=0, timeout=60) + def initialize(host, port, options = {}) + options = {:num_processors => 950, :throttle => 0, :timeout => 60}.merge(options) tries = 0 @socket = TCPServer.new(host, port) @@ -96,9 +98,10 @@ module Mongrel @host = host @port = port @workers = ThreadGroup.new - @throttle = throttle / 100.0 - @num_processors = num_processors - @timeout = timeout + @throttle = options[:throttle] / 100.0 + @num_processors = options[:num_processors] + @timeout = options[:timeout] + @max_concurrent_threads = options[:max_concurrent_threads] || @num_processors end # Does the majority of the IO processing. It has been written in Ruby using @@ -257,6 +260,7 @@ module Mongrel # Runs the thing. It returns the thread used so you can "join" it. You can also # access the HttpServer::acceptor attribute to get the thread later. def run + semaphore = Semaphore.new(@max_concurrent_threads) BasicSocket.do_not_reverse_lookup=true configure_socket_options @@ -282,7 +286,7 @@ module Mongrel client.close rescue nil reap_dead_workers("max processors") else - thread = Thread.new(client) {|c| process_client(c) } + thread = Thread.new(client) {|c| semaphore.synchronize { process_client(c) } } thread[:started_on] = Time.now @workers.add(thread) lib/mongrel.rb @@ -132,11 +132,8 @@ module Mongrel def listener(options={},&block) raise "Cannot call listener inside another listener block." if (@listener or @listener_name) ops = resolve_defaults(options) - ops[:num_processors] ||= 950 - ops[:throttle] ||= 0 - ops[:timeout] ||= 60 - @listener = Mongrel::HttpServer.new(ops[:host], ops[:port].to_i, ops[:num_processors].to_i, ops[:throttle].to_i, ops[:timeout].to_i) + @listener = Mongrel::HttpServer.new(ops[:host], ops[:port].to_i, ops) @listener_name = "#{ops[:host]}:#{ops[:port]}" @listeners[@listener_name] = @listener lib/mongrel/configurator.rb @@ -67,15 +67,10 @@ module Mongrel else begin cgi = Mongrel::CGIWrapper.new(request, response) - cgi.handler = self - # We don't want the output to be really final until we're out of the lock + # We don't want the output to be really final until the dispatch returns a response. cgi.default_really_final = false - @guard.synchronize { - @active_request_path = request.params[Mongrel::Const::PATH_INFO] - Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, response.body) - @active_request_path = nil - } + Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, response.body) # This finalizes the output using the proper HttpResponse way cgi.out("text/html",true) {""} lib/mongrel/rails.rb @@ -26,7 +26,7 @@ class WebServerTest < Test::Unit::TestCase redirect_test_io do # We set num_processors=1 so that we can test the reaping code - @server = HttpServer.new("127.0.0.1", @port, num_processors=1) + @server = HttpServer.new("127.0.0.1", @port, :num_processors => 1) end @tester = TestHandler.new test/unit/test_ws.rb 64d8d94bea8dcf1ac3a9a2782e846b39a8dc5c63 Pivotal Labs pivotal@cumberland.flood.pivotallabs.com http://github.com/pivotal/mongrel/commit/5915b8af83b1d191ecabde76da56932cc08c107a 5915b8af83b1d191ecabde76da56932cc08c107a 2008-08-27T17:00:02-07:00 2008-08-27T17:00:02-07:00 pt/am - Added option to throttle number of concurrent threads processing requests. 631019fc008e259d40647780924e8adb3d5cfaa1 Pivotal Labs pivotal@cumberland.flood.pivotallabs.com