puma 0.8.2 → 0.9.0

data/lib/puma/thread_pool.rb

@@ -1,7 +1,16 @@
 require 'thread'
 
 module Puma
+  # A simple thread pool management object.
+  #
   class ThreadPool
+
+    # Maintain a minimum of +min+ and maximum of +max+ threads
+    # in the pool.
+    #
+    # The block passed is the work that will be performed in each
+    # thread.
+    #
     def initialize(min, max, &blk)
       @todo = Queue.new
       @mutex = Mutex.new
@@ -15,11 +24,15 @@ module Puma
 
       @workers = []
 
+      @auto_trim = nil
+
       min.times { spawn_thread }
     end
 
     attr_reader :spawned
 
+    # How many objects have yet to be processed by the pool?
+    #
     def backlog
       @todo.size
     end
@@ -27,6 +40,7 @@ module Puma
     Stop = Object.new
     Trim = Object.new
 
+    # :nodoc:
     def spawn_thread
       @mutex.synchronize do
         @spawned += 1
@@ -64,6 +78,7 @@ module Puma
       th
     end
 
+    # Add +work+ to the todo list for a Thread to pickup and process.
     def <<(work)
       if @todo.num_waiting == 0 and @spawned < @max
         spawn_thread
@@ -72,6 +87,9 @@ module Puma
       @todo << work
     end
 
+    # If too many threads are in the pool, tell one to finish go ahead
+    # and exit.
+    #
     def trim
       @mutex.synchronize do
         if @spawned - @trim_requested > @min
@@ -81,7 +99,40 @@ module Puma
       end
     end
 
+    class AutoTrim
+      def initialize(pool, timeout)
+        @pool = pool
+        @timeout = timeout
+        @running = false
+      end
+
+      def start!
+        @running = true
+
+        @thread = Thread.new do
+          while @running
+            @pool.trim
+            sleep @timeout
+          end
+        end
+      end
+
+      def stop
+        @running = false
+        @thread.wakeup
+      end
+    end
+
+    def auto_trim!(timeout=5)
+      @auto_trim = AutoTrim.new(self, timeout)
+      @auto_trim.start!
+    end
+
+    # Tell all threads in the pool to exit and wait for them to finish.
+    #
     def shutdown
+      @auto_trim.stop if @auto_trim
+
       @spawned.times do
         @todo << Stop
       end

data/puma.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "0.8.2"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2011-11-22"
+  s.date = "2011-12-06"
   s.description = "Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications.  It is designed for running rack apps only.\n\nWhat makes Puma so fast is the careful use of an Ragel extension to provide fast, accurate HTTP 1.1 protocol parsing. This makes the server scream without too many portability issues."
   s.email = ["evan@phx.io"]
-  s.executables = ["puma"]
+  s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "examples/builder.rb", "examples/camping/README", "examples/camping/blog.rb", "examples/camping/tepee.rb", "examples/httpd.conf", "examples/mime.yaml", "examples/mongrel.conf", "examples/monitrc", "examples/random_thrash.rb", "examples/simpletest.rb", "examples/webrick_compare.rb", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/cli.rb", "lib/puma/const.rb", "lib/puma/events.rb", "lib/puma/gems.rb", "lib/puma/mime_types.yml", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/puma/utils.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tasks/gem.rake", "tasks/java.rake", "tasks/native.rake", "tasks/ragel.rake", "test/lobster.ru", "test/mime.yaml", "test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb", ".gemtest"]
+  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/app/status.rb", "lib/puma/cli.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/events.rb", "lib/puma/null_io.rb", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "test/ab_rs.rb", "test/lobster.ru", "test/mime.yaml", "test/test_app_status.rb", "test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb"]
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "puma"
   s.rubygems_version = "1.8.10"
   s.summary = "Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications"
-  s.test_files = ["test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
+  s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/ab_rs.rb

@@ -0,0 +1,22 @@
+url = ARGV.shift
+count = (ARGV.shift || 1000).to_i
+
+STDOUT.sync = true
+
+1.upto(5) do |i|
+  print "#{i}: "
+  str = `ab -n #{count} -c #{i} #{url} 2>/dev/null`
+
+  rs = /Requests per second:\s+([\d.]+)\s/.match(str)
+  puts rs[1]
+end
+
+puts "Keep Alive:"
+
+1.upto(5) do |i|
+  print "#{i}: "
+  str = `ab -n #{count} -k -c #{i} #{url} 2>/dev/null`
+
+  rs = /Requests per second:\s+([\d.]+)\s/.match(str)
+  puts rs[1]
+end

data/test/test_app_status.rb

@@ -0,0 +1,69 @@
+require 'test/unit'
+require 'puma/app/status'
+
+class TestAppStatus < Test::Unit::TestCase
+  class FakeServer
+    def initialize
+      @status = :running
+      @backlog = 0
+      @running = 0
+    end
+
+    attr_reader :status
+    attr_accessor :backlog, :running
+
+    def stop
+      @status = :stop
+    end
+
+    def halt
+      @status = :halt
+    end
+  end
+
+  def setup
+    @server = FakeServer.new
+    @app = Puma::App::Status.new(@server, @server)
+  end
+
+  def test_unsupported
+    env = { 'PATH_INFO' => "/not-real" }
+
+    status, header, body = @app.call env
+
+    assert_equal 404, status
+  end
+
+  def test_stop
+    env = { 'PATH_INFO' => "/stop" }
+
+    status, header, body = @app.call env
+
+    assert_equal :stop, @server.status
+    assert_equal 200, status
+    assert_equal ['{ "status": "ok" }'], body
+  end
+
+  def test_halt
+    env = { 'PATH_INFO' => "/halt" }
+
+    status, header, body = @app.call env
+
+    assert_equal :halt, @server.status
+    assert_equal 200, status
+    assert_equal ['{ "status": "ok" }'], body
+  end
+
+  def test_stats
+    env = { 'PATH_INFO' => "/stats" }
+
+    @server.backlog = 1
+    @server.running = 9
+
+    status, header, body = @app.call env
+
+    assert_equal 200, status
+    assert_equal ['{ "backlog": 1, "running": 9 }'], body
+  end
+
+end

data/test/test_cli.rb

@@ -4,16 +4,102 @@ require 'tempfile'
 
 class TestCLI < Test::Unit::TestCase
   def setup
-    @pid_file = Tempfile.new("puma-test")
-    @pid_path = @pid_file.path
-    @pid_file.close!
+    @tmp_file = Tempfile.new("puma-test")
+    @tmp_path = @tmp_file.path
+    @tmp_file.close!
+
+    @tmp_path2 = "#{@tmp_path}2"
+
+    File.unlink @tmp_path if File.exist? @tmp_path
+    File.unlink @tmp_path2 if File.exist? @tmp_path2
+  end
+
+  def teardown
+    File.unlink @tmp_path if File.exist? @tmp_path
+    File.unlink @tmp_path2 if File.exist? @tmp_path2
   end
 
   def test_pid_file
-    cli = Puma::CLI.new ["--pidfile", @pid_path]
+    cli = Puma::CLI.new ["--pidfile", @tmp_path]
     cli.parse_options
     cli.write_pid
 
-    assert_equal File.read(@pid_path).strip.to_i, Process.pid
+    assert_equal File.read(@tmp_path).strip.to_i, Process.pid
+  end
+
+  unless defined? JRUBY_VERSION
+  def test_status
+    url = "unix://#{@tmp_path}"
+
+    sin = StringIO.new
+    sout = StringIO.new
+
+    cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}", "--status", url, "test/lobster.ru"], sin, sout
+    cli.parse_options
+
+    t = Thread.new { cli.run }
+
+    sleep 1
+
+    s = UNIXSocket.new @tmp_path
+    s << "GET /stats HTTP/1.0\r\n\r\n"
+    body = s.read
+
+    assert_equal '{ "backlog": 0, "running": 0 }', body.split("\r\n").last
+
+    cli.stop
+    t.join
+  end
+
+  def test_status_stop
+    url = "unix://#{@tmp_path}"
+
+    sin = StringIO.new
+    sout = StringIO.new
+
+    cli = Puma::CLI.new ["-b", "unix://#{@tmp_path2}", "--status", url, "test/lobster.ru"], sin, sout
+    cli.parse_options
+
+    t = Thread.new { cli.run }
+
+    sleep 1
+
+    s = UNIXSocket.new @tmp_path
+    s << "GET /stop HTTP/1.0\r\n\r\n"
+    body = s.read
+
+    assert_equal '{ "status": "ok" }', body.split("\r\n").last
+
+    t.join
+  end
+
+  def test_tmp_status
+    url = "tcp://127.0.0.1:8232"
+    cli = Puma::CLI.new ["--state", @tmp_path, "--status"]
+    cli.parse_options
+    cli.write_state
+
+    data = YAML.load_file(@tmp_path)
+
+    assert_equal Process.pid, data["pid"]
+
+    url = data["status_address"]
+
+    m = %r!unix://(.*)!.match(url)
+
+    assert m, "'#{url}' is not a URL"
+  end
+  end
+
+  def test_state
+    url = "tcp://127.0.0.1:8232"
+    cli = Puma::CLI.new ["--state", @tmp_path, "--status", url]
+    cli.parse_options
+    cli.write_state
+
+    data = YAML.load_file(@tmp_path)
+
+    assert_equal Process.pid, data["pid"]
+    assert_equal url, data["status_address"]
   end
 end

data/test/test_http11.rb

@@ -6,7 +6,7 @@ require 'test/testhelp'
 include Puma
 
 class Http11ParserTest < Test::Unit::TestCase
-    
+
   def test_parse_simple
     parser = HttpParser.new
     req = {}
@@ -130,22 +130,5 @@ class Http11ParserTest < Test::Unit::TestCase
     end
 
   end
-
-
-
-  def test_query_parse
-    res = Utils.query_parse("zed=1&frank=#{Utils.escape('&&& ')}")
-    assert res["zed"], "didn't get the request right"
-    assert res["frank"], "no frank"
-    assert_equal "1", res["zed"], "wrong result"
-    assert_equal "&&& ", Utils.unescape(res["frank"]), "wrong result"
-
-    res = Utils.query_parse("zed=1&zed=2&zed=3&frank=11;zed=45")
-    assert res["zed"], "didn't get the request right"
-    assert res["frank"], "no frank"
-    assert_equal 4,res["zed"].length, "wrong number for zed"
-    assert_equal "11",res["frank"], "wrong number for frank"
-  end
-  
 end
 

data/test/test_persistent.rb

@@ -123,7 +123,7 @@ class TestPersistent < Test::Unit::TestCase
     @client << @keep_request
     sz = @body[0].size.to_s
 
-    assert_equal "HTTP/1.0 200 OK\r\nX-Header: Works\r\nContent-Length: #{sz}\r\n\r\n", lines(4)
+    assert_equal "HTTP/1.0 200 OK\r\nX-Header: Works\r\nConnection: Keep-Alive\r\nContent-Length: #{sz}\r\n\r\n", lines(5)
     assert_equal "Hello", @client.read(5)
   end
 
@@ -197,8 +197,8 @@ class TestPersistent < Test::Unit::TestCase
     assert_equal "HTTP/1.1 200 OK\r\nX-Header: Works\r\nContent-Length: #{sz}\r\n\r\n", lines(4)
     assert_equal "Hello", @client.read(5)
 
-    assert_equal "", @inputs[0].string
-    assert_equal "", @inputs[1].string
+    assert_kind_of Puma::NullIO, @inputs[0]
+    assert_kind_of Puma::NullIO, @inputs[1]
 
   end
 

data/test/test_rack_server.rb

@@ -68,6 +68,8 @@ class TestRackServer < Test::Unit::TestCase
 
     hit(['http://localhost:9998/test'])
 
+    stop
+
     if exc = @checker.exception
       raise exc
     end
@@ -80,6 +82,8 @@ class TestRackServer < Test::Unit::TestCase
 
     hit(['http://localhost:9998/test/a/b/c'])
 
+    stop
+
     assert_equal "/test/a/b/c", input['PATH_INFO']
   end
 
@@ -95,6 +99,8 @@ class TestRackServer < Test::Unit::TestCase
 
     hit(['http://localhost:9998/test'])
 
+    stop
+
     assert_equal true, closed
   end
 

data/test/test_thread_pool.rb

@@ -99,4 +99,28 @@ class TestThreadPool < Test::Unit::TestCase
 
     assert_equal 1, pool.spawned
   end
+
+  def test_autotrim
+    finish = false
+    pool = new_pool(1, 2) { Thread.pass until finish }
+
+    pool << 1
+    pool << 2
+
+    assert_equal 2, pool.spawned
+
+    finish = true
+
+    pause
+
+    assert_equal 2, pool.spawned
+
+    pool.auto_trim! 1
+
+    sleep 1
+
+    pause
+
+    assert_equal 1, pool.spawned
+  end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 8
-  - 2
-  version: 0.8.2
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 Z
+date: 2011-12-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -56,13 +56,28 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 27
         segments: 
         - 2
-        - 10
-        version: "2.10"
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
+  type: :development
+  version_requirements: *id004
 description: |-
   Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications.  It is designed for running rack apps only.
   
@@ -71,6 +86,7 @@ email:
 - evan@phx.io
 executables: 
 - puma
+- pumactl
 extensions: 
 - ext/puma_http11/extconf.rb
 extra_rdoc_files: 
@@ -86,17 +102,7 @@ files:
 - Rakefile
 - TODO
 - bin/puma
-- examples/builder.rb
-- examples/camping/README
-- examples/camping/blog.rb
-- examples/camping/tepee.rb
-- examples/httpd.conf
-- examples/mime.yaml
-- examples/mongrel.conf
-- examples/monitrc
-- examples/random_thrash.rb
-- examples/simpletest.rb
-- examples/webrick_compare.rb
+- bin/pumactl
 - ext/puma_http11/PumaHttp11Service.java
 - ext/puma_http11/ext_help.h
 - ext/puma_http11/extconf.rb
@@ -109,23 +115,21 @@ files:
 - ext/puma_http11/org/jruby/puma/Http11Parser.java
 - ext/puma_http11/puma_http11.c
 - lib/puma.rb
+- lib/puma/app/status.rb
 - lib/puma/cli.rb
 - lib/puma/const.rb
+- lib/puma/control_cli.rb
 - lib/puma/events.rb
-- lib/puma/gems.rb
-- lib/puma/mime_types.yml
+- lib/puma/null_io.rb
 - lib/puma/rack_patch.rb
 - lib/puma/server.rb
 - lib/puma/thread_pool.rb
-- lib/puma/utils.rb
 - lib/rack/handler/puma.rb
 - puma.gemspec
-- tasks/gem.rake
-- tasks/java.rake
-- tasks/native.rake
-- tasks/ragel.rake
+- test/ab_rs.rb
 - test/lobster.ru
 - test/mime.yaml
+- test/test_app_status.rb
 - test/test_cli.rb
 - test/test_http10.rb
 - test/test_http11.rb
@@ -137,7 +141,6 @@ files:
 - test/test_ws.rb
 - test/testhelp.rb
 - tools/trickletest.rb
-- .gemtest
 homepage: 
 licenses: []
 
@@ -168,11 +171,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: puma
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications
 test_files: 
+- test/test_app_status.rb
 - test/test_cli.rb
 - test/test_http10.rb
 - test/test_http11.rb