puma 0.9.3 → 0.9.4

data/Rakefile

@@ -62,7 +62,7 @@ Rake::ExtensionTask.new("puma_http11", HOE.spec) do |ext|
   # place extension inside namespace
   ext.lib_dir = "lib/puma"
 
-  ext.cross_compile = !!ENV['CROSS']
+  ext.cross_compile = true
   ext.cross_platform = ['i386-mswin32-60', 'i386-mingw32']
   ext.cross_compiling do |spec|
     # add fat-binary stub only when cross compiling
@@ -74,10 +74,8 @@ Rake::ExtensionTask.new("puma_http11", HOE.spec) do |ext|
 end
 
 # Java (JRuby)
-if defined? JRUBY_VERSION
-  Rake::JavaExtensionTask.new("puma_http11", HOE.spec) do |ext|
-    ext.lib_dir = "lib/puma"
-  end
+Rake::JavaExtensionTask.new("puma_http11", HOE.spec) do |ext|
+  ext.lib_dir = "lib/puma"
 end
 
 # the following is a fat-binary stub that will be used when

data/ext/puma_http11/PumaHttp11Service.java

@@ -1,3 +1,5 @@
+package puma;
+
 import java.io.IOException;
         
 import org.jruby.Ruby;

data/lib/puma/cli.rb

@@ -6,6 +6,7 @@ require 'puma/const'
 require 'puma/configuration'
 
 require 'rack/commonlogger'
+require 'rack/utils'
 
 module Puma
   # Handles invoke a Puma::Server in a command line style.
@@ -120,6 +121,11 @@ module Puma
           @options[:config_file] = arg
         end
 
+        o.on "-p", "--port PORT", "Define what port TCP port to bind to",
+                                  "Use -b for more advanced options" do |arg|
+          @options[:binds] << "tcp://#{Configuration::DefaultTCPHost}:#{arg}"
+        end
+
         o.on "--pidfile PATH", "Use PATH as a pidfile" do |arg|
           @options[:pidfile] = arg
         end
@@ -238,6 +244,27 @@ module Puma
           path = "#{uri.host}#{uri.path}"
 
           server.add_unix_listener path
+        when "ssl"
+          log "* Listening on #{str}"
+          params = Rack::Utils.parse_query uri.query
+          require 'openssl'
+
+          ctx = OpenSSL::SSL::SSLContext.new
+          unless params['key']
+            error "Please specify the SSL key via 'key='"
+          end
+
+          ctx.key = OpenSSL::PKey::RSA.new File.read(params['key'])
+
+          unless params['cert']
+            error "Please specify the SSL cert via 'cert='"
+          end
+
+          ctx.cert = OpenSSL::X509::Certificate.new File.read(params['cert'])
+
+          ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+          server.add_ssl_listener uri.host, uri.port, ctx
         else
           error "Invalid URI: #{str}"
         end

data/lib/puma/configuration.rb

@@ -179,6 +179,15 @@ module Puma
         @options[:max_threads] = max
       end
 
+      def ssl_bind(host, port, opts)
+        o = [
+          "cert=#{opts[:cert]}",
+          "key=#{opts[:key]}"
+        ]
+
+        @options[:binds] << "ssl://#{host}:#{port}?#{o.join('&')}"
+      end
+
       # Use +path+ as the file to store the server info state. This is
       # used by pumactl to query and control the server.
       #

data/lib/puma/const.rb

@@ -75,7 +75,7 @@ module Puma
 
     PATH_INFO = 'PATH_INFO'.freeze
 
-    PUMA_VERSION = VERSION = "0.9.3".freeze
+    PUMA_VERSION = VERSION = "0.9.4".freeze
 
     PUMA_TMP_BASE = "puma".freeze
 

data/lib/puma/events.rb

@@ -33,7 +33,7 @@ module Puma
     # +server+ is the Server object, +env+ the request, +error+ an exception
     # object, and +kind+ some additional info.
     #
-    def unknown_error(server, env, error, kind="Unknown")
+    def unknown_error(server, error, kind="Unknown")
       if error.respond_to? :render
         error.render "#{Time.now}: #{kind} error", @stderr
       else

data/lib/puma/server.rb

@@ -66,6 +66,8 @@ module Puma
         SERVER_SOFTWARE => PUMA_VERSION,
         GATEWAY_INTERFACE => CGI_VER
       }
+
+      ENV['RACK_ENV'] ||= "development"
     end
 
     # On Linux, use TCP_CORK to better control how the TCP stack
@@ -106,6 +108,16 @@ module Puma
       @ios << s
     end
 
+    def add_ssl_listener(host, port, ctx, optimize_for_latency=true, backlog=1024)
+      s = TCPServer.new(host, port)
+      if optimize_for_latency
+        s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+      end
+      s.listen backlog
+      @proto_env[HTTPS_KEY] = HTTPS
+      @ios << OpenSSL::SSL::SSLServer.new(s, ctx)
+    end
+
     # Tell the server to listen on +path+ as a UNIX domain socket.
     #
     def add_unix_listener(path)
@@ -156,7 +168,7 @@ module Puma
               # client closed the socket even before accept
               client.close rescue nil
             rescue Object => e
-              @events.unknown_error self, env, e, "Listen loop"
+              @events.unknown_error self, e, "Listen loop"
             end
           end
 

data/lib/puma/thread_pool.rb

@@ -12,21 +12,29 @@ module Puma
     # thread.
     #
     def initialize(min, max, &blk)
-      @todo = Queue.new
+      @cond = ConditionVariable.new
       @mutex = Mutex.new
 
+      @todo = []
+
       @spawned = 0
+      @waiting = 0
+
       @min = min
       @max = max
       @block = blk
 
+      @shutdown = false
+
       @trim_requested = 0
 
       @workers = []
 
       @auto_trim = nil
 
-      min.times { spawn_thread }
+      @mutex.synchronize do
+        min.times { spawn_thread }
+      end
     end
 
     attr_reader :spawned
@@ -34,37 +42,54 @@ module Puma
     # How many objects have yet to be processed by the pool?
     #
     def backlog
-      @todo.size
+      @mutex.synchronize { @todo.size }
     end
 
-    Stop = Object.new
-    Trim = Object.new
-
     # :nodoc:
+    #
+    # Must be called with @mutex held!
+    #
     def spawn_thread
-      @mutex.synchronize do
-        @spawned += 1
-      end
+      @spawned += 1
 
       th = Thread.new do
         todo = @todo
         block = @block
 
         while true
-          work = todo.pop
-
-          case work
-          when Stop
-            break
-          when Trim
-            @mutex.synchronize do
-              @trim_requested -= 1
+          work = nil
+
+          continue = true
+
+          @mutex.synchronize do
+            while todo.empty?
+              if @trim_requested > 0
+                @trim_requested -= 1
+                continue = false
+                break
+              end
+
+              if @shutdown
+                continue = false
+                break
+              end
+
+              @waiting += 1
+              @cond.wait @mutex
+              @waiting -= 1
+
+              if @shutdown
+                continue = false
+                break
+              end
             end
 
-            break
-          else
-            block.call work
+            work = todo.pop if continue
           end
+
+          break unless continue
+
+          block.call work
         end
 
         @mutex.synchronize do
@@ -73,28 +98,39 @@ module Puma
         end
       end
 
-      @mutex.synchronize { @workers << th }
+      @workers << th
 
       th
     end
 
+    private :spawn_thread
+
     # 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
-      end
+      @mutex.synchronize do
+        if @shutdown
+          raise "Unable to add work while shutting down"
+        end
 
-      @todo << work
+        @todo << work
+
+        if @waiting == 0 and @spawned < @max
+          spawn_thread
+        end
+
+        @cond.signal
+      end
     end
 
     # If too many threads are in the pool, tell one to finish go ahead
-    # and exit.
+    # and exit. If +force+ is true, then a trim request is requested
+    # even if all threads are being utilized.
     #
-    def trim
+    def trim(force=false)
       @mutex.synchronize do
-        if @spawned - @trim_requested > @min
+        if (force or @waiting > 0) and @spawned - @trim_requested > @min
           @trim_requested += 1
-          @todo << Trim
+          @cond.signal
         end
       end
     end
@@ -131,10 +167,11 @@ module Puma
     # Tell all threads in the pool to exit and wait for them to finish.
     #
     def shutdown
-      @auto_trim.stop if @auto_trim
+      @mutex.synchronize do
+        @shutdown = true
+        @cond.broadcast
 
-      @spawned.times do
-        @todo << Stop
+        @auto_trim.stop if @auto_trim
       end
 
       # Use this instead of #each so that we don't stop in the middle

data/puma.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-01-09"
+  s.date = "2012-03-02"
   s.description = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.\n\nUnder the hood, Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request in a thread from an internal thread pool (which you can control). This allows Puma to provide real concurrency for your web application!\n\nWith Rubinius 2.0, Puma will utilize all cores on your CPU with real threads, meaning you won't have to spawn multiple processes to increase throughput. You can expect to see a similar benefit from JRuby.\n\nOn MRI, there is a Global Interpreter Lock (GIL) that ensures only one thread can be run at a time. But if you're doing a lot of blocking IO (such as HTTP calls to external APIs like Twitter), Puma still improves MRI's throughput by allowing blocking IO to be run concurrently (EventMachine-based servers such as Thin turn off this ability, requiring you to use special libraries). Your mileage may vary.. in order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like [Rubinius](http://rubini.us) or [JRuby](http://jruby.org)."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubyforge_project = "puma"
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.17"
   s.summary = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications"
   s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.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"]
 
@@ -27,15 +27,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.2"])
       s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_development_dependency(%q<hoe>, ["~> 2.12"])
     else
       s.add_dependency(%q<rack>, ["~> 1.2"])
       s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_dependency(%q<hoe>, ["~> 2.12"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.2"])
     s.add_dependency(%q<rake-compiler>, ["~> 0.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.10"])
     s.add_dependency(%q<hoe>, ["~> 2.12"])
   end
 end

data/test/test_thread_pool.rb

@@ -70,6 +70,8 @@ class TestThreadPool < Test::Unit::TestCase
 
     finish = true
 
+    pause
+
     assert_equal 2, pool.spawned
     pool.trim
     pause
@@ -82,7 +84,25 @@ class TestThreadPool < Test::Unit::TestCase
 
   end
 
-  def test_trim_doesnt_overtrim
+  def test_force_trim_doesnt_overtrim
+    finish = false
+    pool = new_pool(1, 2) { Thread.pass until finish }
+
+    pool << 1
+    pool << 2
+
+    assert_equal 2, pool.spawned
+    pool.trim true
+    pool.trim true
+
+    finish = true
+
+    pause
+
+    assert_equal 1, pool.spawned
+  end
+
+  def test_trim_is_ignored_if_no_waiting_threads
     finish = false
     pool = new_pool(1, 2) { Thread.pass until finish }
 
@@ -97,7 +117,7 @@ class TestThreadPool < Test::Unit::TestCase
 
     pause
 
-    assert_equal 1, pool.spawned
+    assert_equal 2, pool.spawned
   end
 
   def test_autotrim

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puma
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-09 00:00:00 Z
+date: 2012-03-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -49,9 +49,24 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,7 +77,7 @@ dependencies:
         - 12
         version: "2.12"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: |-
   Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.
   
@@ -170,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: puma
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications