rainbows 4.0.0 → 4.1.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v4.0.0.GIT
+DEF_VER=v4.1.0.GIT
 
 LF='
 '

data/bin/rainbows

@@ -8,7 +8,7 @@ ENV["RACK_ENV"] ||= "development"
 rackup_opts = Unicorn::Configurator::RACKUP
 options = rackup_opts[:options]
 
-opts = OptionParser.new("", 24, '  ') do |opts|
+op = OptionParser.new("", 24, '  ') do |opts|
   cmd = File.basename($0)
   opts.banner = "Usage: #{cmd} " \
                 "[ruby options] [#{cmd} options] [rackup config file]"
@@ -106,7 +106,8 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   opts.parse! ARGV
 end
 
-app = Unicorn.builder(ARGV[0] || 'config.ru', opts)
+app = Unicorn.builder(ARGV[0] || 'config.ru', op)
+op = nil
 
 if $DEBUG
   require 'pp'

data/lib/rainbows.rb

@@ -1,20 +1,8 @@
 # -*- encoding: binary -*-
 require 'kgio'
 require 'unicorn'
-require 'io/wait'
-Unicorn::SocketHelper::DEFAULTS.merge!({
-  # the value passed to TCP_DEFER_ACCEPT actually matters in Linux 2.6.32+
-  :tcp_defer_accept => 60,
-
-  # keep-alive performance sucks without this due to
-  # write(headers)-write(body)-read
-  # because we always write headers and bodies with two calls
-  :tcp_nodelay => true,
-
-  # we always want to send our headers out ASAP since Rainbows!
-  # is designed for apps that could trickle out the body slowly
-  :tcp_nopush => false,
-})
+# the value passed to TCP_DEFER_ACCEPT actually matters in Linux 2.6.32+
+Unicorn::SocketHelper::DEFAULTS[:tcp_defer_accept] = 60
 
 # See http://rainbows.rubyforge.org/ for documentation
 module Rainbows

data/lib/rainbows/client.rb

@@ -1,34 +1,9 @@
 # -*- encoding: binary -*-
 # :enddoc:
-require "io/wait"
 
 # this class is used for most synchronous concurrency models
 class Rainbows::Client < Kgio::Socket
   include Rainbows::ProcessClient
-  Rainbows.config!(self, :keepalive_timeout)
-
-  def read_expire
-    Time.now + KEEPALIVE_TIMEOUT
-  end
-
-  def kgio_wait_readable
-    wait KEEPALIVE_TIMEOUT
-  end
-
-  # used for reading headers (respecting keepalive_timeout)
-  def timed_read(buf)
-    expire = nil
-    begin
-      case rv = kgio_tryread(CLIENT_HEADER_BUFFER_SIZE, buf)
-      when :wait_readable
-        return if expire && expire < Time.now
-        expire ||= read_expire
-        kgio_wait_readable
-      else
-        return rv
-      end
-    end while true
-  end
 
   alias write kgio_write
 end

data/lib/rainbows/const.rb

@@ -2,7 +2,7 @@
 # :enddoc:
 module Rainbows::Const
 
-  RAINBOWS_VERSION = '4.0.0'
+  RAINBOWS_VERSION = '4.1.0'
 
   include Unicorn::Const
 

data/lib/rainbows/fiber/coolio/methods.rb

@@ -28,7 +28,7 @@ module Rainbows::Fiber::Coolio::Methods
     @w.disable
   end
 
-  def kgio_wait_readable
+  def kgio_wait_readable(timeout = nil)
     @r = Watcher.new(self, :r) unless defined?(@r)
     @r.enable unless @r.enabled?
     Fiber.yield

data/lib/rainbows/fiber/io/methods.rb

@@ -29,7 +29,7 @@ module Rainbows::Fiber::IO::Methods
     super
   end
 
-  def kgio_wait_readable
+  def kgio_wait_readable(timeout = nil)
     fd = fileno
     @f = Fiber.current
     RD[fd] = self

data/lib/rainbows/process_client.rb

@@ -7,7 +7,26 @@ module Rainbows::ProcessClient
   NULL_IO = Unicorn::HttpRequest::NULL_IO
   RACK_INPUT = Unicorn::HttpRequest::RACK_INPUT
   IC = Unicorn::HttpRequest.input_class
-  Rainbows.config!(self, :client_header_buffer_size)
+  Rainbows.config!(self, :client_header_buffer_size, :keepalive_timeout)
+
+  def read_expire
+    Time.now + KEEPALIVE_TIMEOUT
+  end
+
+  # used for reading headers (respecting keepalive_timeout)
+  def timed_read(buf)
+    expire = nil
+    begin
+      case rv = kgio_tryread(CLIENT_HEADER_BUFFER_SIZE, buf)
+      when :wait_readable
+        return if expire && expire < Time.now
+        expire ||= read_expire
+        kgio_wait_readable(KEEPALIVE_TIMEOUT)
+      else
+        return rv
+      end
+    end while true
+  end
 
   def process_loop
     @hp = hp = Rainbows::HttpParser.new

data/lib/rainbows/socket_proxy.rb

@@ -18,6 +18,14 @@ module Rainbows::SocketProxy
     to_io.kgio_trywrite(buf)
   end
 
+  def kgio_tryread(size, buf = "")
+    to_io.kgio_tryread(size, buf)
+  end
+
+  def kgio_wait_readable(timeout = nil)
+    to_io.kgio_wait_readable(timeout)
+  end
+
   def timed_read(buf)
     to_io.timed_read(buf)
   end

data/rainbows.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
   # we want a newer Rack for a valid HeaderHash#each
   s.add_dependency(%q<rack>, ['~> 1.1'])
 
-  # kgio has some fixes for MRI 1.9.3dev that affect us
-  s.add_dependency(%q<kgio>, ['~> 2.4'])
+  # kgio 2.5 has kgio_wait_* methods that take optional timeout args
+  s.add_dependency(%q<kgio>, ['~> 2.5'])
 
   # we need Unicorn for the HTTP parser and process management
   s.add_dependency(%q<unicorn>, ["~> 4.0"])

data/t/t0044-autopush.sh

@@ -49,8 +49,8 @@ check_TCP_CORK () {
 	done
 
 	test 2 -eq $(grep TCP_CORK $strace_out | wc -l)
-	fgrep 'SOL_TCP, TCP_CORK, [0], 4) = 0' $strace_out
-	fgrep 'SOL_TCP, TCP_CORK, [1], 4) = 0' $strace_out
+	fgrep 'SOL_TCP, TCP_CORK, [0],' $strace_out
+	fgrep 'SOL_TCP, TCP_CORK, [1],' $strace_out
 }
 
 t_begin "setup and start" && {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: 
   segments: 
   - 4
+  - 1
   - 0
-  - 0
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 Z
+date: 2011-07-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -40,11 +40,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 2
-        - 4
-        version: "2.4"
+        - 5
+        version: "2.5"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency