rainbows 0.97.0 → 1.0.0pre1

data/.manifest

@@ -25,11 +25,10 @@ TUNING
 Test_Suite
 bin/rainbows
 lib/rainbows.rb
-lib/rainbows/acceptor.rb
 lib/rainbows/actor_spawn.rb
 lib/rainbows/app_pool.rb
 lib/rainbows/base.rb
-lib/rainbows/byte_slice.rb
+lib/rainbows/client.rb
 lib/rainbows/configurator.rb
 lib/rainbows/const.rb
 lib/rainbows/dev_fd_response.rb
@@ -43,8 +42,17 @@ lib/rainbows/fiber.rb
 lib/rainbows/fiber/base.rb
 lib/rainbows/fiber/body.rb
 lib/rainbows/fiber/io.rb
+lib/rainbows/fiber/io/compat.rb
+lib/rainbows/fiber/io/methods.rb
+lib/rainbows/fiber/io/pipe.rb
+lib/rainbows/fiber/io/socket.rb
 lib/rainbows/fiber/queue.rb
 lib/rainbows/fiber/rev.rb
+lib/rainbows/fiber/rev/heartbeat.rb
+lib/rainbows/fiber/rev/kato.rb
+lib/rainbows/fiber/rev/methods.rb
+lib/rainbows/fiber/rev/server.rb
+lib/rainbows/fiber/rev/sleeper.rb
 lib/rainbows/fiber_pool.rb
 lib/rainbows/fiber_spawn.rb
 lib/rainbows/http_response.rb
@@ -52,7 +60,9 @@ lib/rainbows/http_server.rb
 lib/rainbows/max_body.rb
 lib/rainbows/never_block.rb
 lib/rainbows/never_block/event_machine.rb
+lib/rainbows/process_client.rb
 lib/rainbows/queue_pool.rb
+lib/rainbows/read_timeout.rb
 lib/rainbows/response.rb
 lib/rainbows/response/body.rb
 lib/rainbows/response/range.rb
@@ -110,6 +120,7 @@ t/fast-pipe-response.ru
 t/file-wrap-to_path.ru
 t/fork-sleep.ru
 t/heartbeat-timeout.ru
+t/kgio-pipe-response.ru
 t/large-file-response.ru
 t/my-tap-lib.sh
 t/rack-fiber_pool/app.ru
@@ -162,6 +173,7 @@ t/t0030-fast-pipe-response.sh
 t/t0031-close-pipe-response.sh
 t/t0032-close-pipe-to_path-response.sh
 t/t0034-pipelined-pipe-response.sh
+t/t0035-kgio-pipe-response.sh
 t/t0100-rack-input-hammer-chunked.sh
 t/t0100-rack-input-hammer-content-length.sh
 t/t0101-rack-input-trailer.sh

data/ChangeLog

@@ -1,178 +1,147 @@
-ChangeLog from git://git.bogomips.org/rainbows.git (v0.96.0..v0.97.0)
+ChangeLog from git://git.bogomips.org/rainbows.git (v0.97.0..v1.0.0pre1)
 
-    commit aaa01d6a15847c227c61254f7b8f0ee82275a94d
+    commit a47cd4a7f392a76357ed4f3e458797ae1f9c8f25
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Aug 28 19:31:20 2010 +0000
+    Date:   Tue Oct 26 21:26:03 2010 +0000
     
-        Rainbows! 0.97.0
+        Rainbows! 1.0.0pre1 - kinder, gentler I/O
         
-        We now depend on Unicorn 1.1.3 to avoid race conditions during
-        log cycling.  This bug mainly affected folks using Rainbows! as
-        a multithreaded static file server.
-        
-        "keepalive_timeout 0" now works as documented for all backends
-        to completely disable keepalive.  This was previously broken
-        under EventMachine, Rev, and Revactor.
-        
-        There is a new Rainbows::ThreadTimeout Rack middleware which
-        gives soft timeouts to apps running on multithreaded backends.
-        
-        There are several bugfixes for proxying IO objects and the usual
-        round of small code cleanups and documentation updates.
-        
-        See the commits in git for all the details.
+        Mostly internal changes for kgio (and Unicorn) integration.
+        There should be no (supported) user-visible changes from
+        Rainbows! 0.97.0.  kgio should improve performance for
+        concurrency models that use non-blocking I/O internally,
+        especially under Ruby 1.9.2
     
-    commit 4bb365590b4ac2c4ae43a6c6252a98d2d4b7a601
+    commit 0298a6743f2cadf8c8e47a298c5b35505b74af46
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Aug 28 19:29:36 2010 +0000
+    Date:   Tue Oct 26 21:20:45 2010 +0000
     
-        bump Unicorn dependency to 1.1.3
+        gemspec: bump development dependency of Isolate
         
-        Unicorn 1.1.3 fixes potential race conditions during
-        SIGUSR1 log reopening.
+        Might as well go with the latest and greatest,
+        it has saner defaults at least.
     
-    commit 32d3b1f052810eb15362d001d1501be0e2da88d8
+    commit 567e6ce5dba5ad2cca2cca8c64123e27939bff2b
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Aug 28 06:50:51 2010 +0000
+    Date:   Tue Oct 26 21:13:10 2010 +0000
     
-        "keepalive_timeout 0" (really) disables keepalive
-        
-        Although this behavior is mentioned on the documentation,
-        this was broken under EventMachine, Rev*, and Revactor.
+        doc: RDoc updates
         
-        Furthermore, we set the "Connection: close" header to allow the
-        client to optimize is handling of non-keepalive connections.
+        Once again we avoid documenting internals on the public
+        website and use code comments for other developers.
     
-    commit 108d6afd7ff390bb594c99ba23c91163fa98d8c0
+    commit 894cb73887c106acc793f0317ee849ae215ead56
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Aug 28 06:11:45 2010 +0000
+    Date:   Mon Oct 25 22:15:47 2010 +0000
     
-        t0016: disable Rack::Lint for speed
-        
-        Rack::Lint uses String#inspect to generate assertion messages
-        whether or not the assertions are triggered at all.
-        Unfortunately String#inspect is hilariously slow under 1.9.2
-        when dealing with odd characters and large strings.
+        reduce dependency on IO#write_nonblock
         
-        The performance difference is huge:
-        
-        	before: 1m4.386s
-        	 after: 0m3.877s
+        kgio_trywrite is superior if it is available.
+    
+    commit 4ee6e0dafeb1b7af28fa90ae27c1a1a04aa8e852
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Sat Oct 23 00:42:04 2010 +0000
+    
+        http_request: remove this (sub)class
         
-        We already have Rack::Lint enabled everywhere else, so removing
-        this where performance matters most shouldn't hurt us.
+        It does not appear to be needed, for now, since the
+        parser and Unicorn::HttpRequest are one and the same.
     
-    commit 33eeda85248c9132366f94f1e1a83365bb33b5a7
+    commit 180485d49ea858f83ef2a28a9e07224aa514edc7
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Sat Aug 28 03:23:51 2010 +0000
+    Date:   Fri Oct 22 16:21:03 2010 -0700
     
-        rev_thread_*: fix IO proxy failures w/pipelining
+        unindent most files
         
-        Proxying IO objects with threaded Rev concurrency models
-        occasionally failed with pipelined requests (t0034).  By
-        deferring the on_write_complete callback until the next
-        "tick" (similar to what we do in Rev::Client#write),
-        we prevent clobbering responses during pipelining.
+        This simplifies and disambiguates most constant resolution
+        issues as well as lowering our identation level.  Hopefully
+        this makes code easier to understand.
     
-    commit 6e3a07b69e79ee0d3f554cbe72d37669586fa449
+    commit 41145ed4d335718ac43aec9313b7571a12fe96ee
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Fri Aug 27 07:35:23 2010 +0000
+    Date:   Fri Oct 22 15:31:47 2010 -0700
     
-        rainbows/rev/core: tiny cleanup
+        local.mk.sample: remove testing under 1.9.1
         
-        Remove an unused constant.
+        Ruby 1.9.2 has been out for a while and is the stable
+        release nowadays.
     
-    commit 81ec1240c2e358dcd66b3678e0b771669b1ee68e
+    commit b595ad7333ff85452b229674c6726e40d2cf7bb9
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Fri Aug 27 07:17:38 2010 +0000
+    Date:   Fri Oct 22 18:55:46 2010 +0000
     
-        rainbows/rev/master: unindent
+        README: update copyright year
         
-        No constant resolution changes, avoid redefining
-        modules needlessly since this is not meant to be
-        used standalone.
+        This project is over 1 year old!
     
-    commit 47e1ee2d90161abf92ce14562bf508398fdfa6c9
-    Author: Eric Wong <e@yhbt.net>
-    Date:   Wed Aug 25 13:58:11 2010 -0700
+    commit 4a568eeb7d17885579790d0ae004f04aa13479cb
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Fri Oct 22 02:50:09 2010 +0000
     
-        split out accept() callers to acceptor module
+        dev_fd_response: do not wrap for Fiber-aware IOs
         
-        Trying to avoid adding singleton methods since it's too easily
-        accessible by the public and not needed by the general public.
-        This also allows us (or just Zbatery) to more easily add support
-        systems without FD_CLOEXEC or fcntl, and also to optimize
-        away a fcntl call for systems that inherit FD_CLOEXEC.
+        Applications may use wait_readable-aware methods directly
+        to work with Rainbows!
     
-    commit bd3ed0b04f826b20cce83f9b77fc13c0eefd3902
+    commit 6d46978bdc8d2ee4263431ecdcada53389b12597
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Wed Aug 18 23:59:21 2010 -0700
+    Date:   Fri Oct 22 02:51:18 2010 +0000
     
-        add Rainbows::ThreadTimeout middleware
+        fiber_{pool,spawn}: unindent
         
-        This allows for per-dispatch timeouts similar to (but not exactly)
-        the way Mongrel (1.1.x) implemented them with threads.
+        Reduces confusion for constant resolution/scoping rules
+        and lowers LoC.
     
-    commit ac05e7035e1946b78ce4679548db7680aa01734c
+    commit 03806d2b44c2d3cee75258ee9e83d671e751baeb
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Tue Aug 17 08:35:03 2010 +0000
+    Date:   Fri Oct 22 02:38:40 2010 +0000
     
-        avoid EBADF with certain middlewares when proxying
+        fiber_pool: no need for old Fiber::IO
         
-        First off we use an FD_MAP to avoid creating redundant IO
-        objects which map to the same FD.  When that doesn't work, we'll
-        fall back to trapping Errno::EBADF and IOError where
-        appropriate.
+        Rainbows::Client takes care of the I/O wait/read-ability
+        for us already.
     
-    commit 9c5669e232f8f57c2d8e08d84e21bf09cd87bfa1
+    commit 15631717fce044fbad2f386a7b1c7daf4bdd83d2
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Tue Aug 17 05:30:49 2010 +0000
+    Date:   Thu Oct 21 16:25:39 2010 -0700
     
-        rev/client: fix redundant close of client sockets
+        code shuffling for kgio
         
-        Our keep-alive timeout mechanism does not need to kick in and
-        redundantly close when a client.  Fortunately there is no danger
-        of redundantly closing the same numeric file descriptors (and
-        perhaps causing difficult-to-track-down errors).
+        Despite the large number of changes, most of it is code
+        movement here.
     
-    commit 2f0ac01589cdc9775f7a5668c4ac491712a9f1b1
+    commit d4a2b5dd2b85f4b2d3bb120ee1e1b0dde31bc25c
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Mon Aug 16 01:02:30 2010 +0000
+    Date:   Wed Oct 20 17:48:58 2010 -0700
     
-        FAQ: update SSL section, add Pound
+        unicorn 2.x updates + kgio
         
-        Pound appears to work well in my limited testing with
-        t/sha1.ru and "curl -T-"
+        We get basic internal API changes from Unicorn,
+        code simplifications coming next.
     
-    commit a8f16c6837b56f1a344e4686d029a9a068f69491
+    commit a085ba3586756ac1f778d2862f75889de2449b0e
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Fri Aug 13 13:37:46 2010 -0700
+    Date:   Wed Oct 20 17:48:57 2010 -0700
     
-        dev_fd_response: weaken /dev/fd check for compatibility
+        http_server: more descriptive error for debugging
         
-        /dev/fd/0 may not be stat()-able on some systems after dropping
-        permissions from root to a regular user.  So just check for
-        "/dev/fd" which seems to work on RHEL 2.6.18 kernels.  This also
-        allow us to be used independently of Unicorn in case somebody
-        ever feels the compelling need to /close/ stdin.
+        Sometimes we have stupid syntax or constant resolution
+        errors in our code.
     
-    commit 047365a95fda8765d4339036d41f0cb5f30a1381
+    commit ad821f70a2488a91f2be1ac53cb2e64f50743989
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Tue Aug 10 06:39:40 2010 +0000
+    Date:   Tue Sep 28 17:40:01 2010 -0700
     
-        doc: it's always "Rainbows!" with a bang(!)
+        start using kgio library
         
-        That is the official name of the project and we will not lead
-        people to believe differently.
+        It removes the burden of byte slicing and setting file
+        descriptor flags.  In some cases, we can remove unnecessary
+        peeraddr calls, too.
     
-    commit 66e48599b0d98d059862e2eeb64935b0abebc9d0
+    commit 11c75ec06ce72cea0c760161dc01a196500aa293
     Author: Eric Wong <normalperson@yhbt.net>
-    Date:   Mon Aug 9 16:14:38 2010 -0700
+    Date:   Fri Sep 17 08:55:35 2010 +0000
     
-        FAQ: update Rails requires for Ruby 1.9.2
+        event_machine: remove unnecessary "return"
         
-        Ruby 1.9.2 no longer includes '.' inside $LOAD_PATH by default,
-        so those requires won't work unless we specify the full path.
-        We prefer File.expand_path to prefixing './' since we want to be
-        consistent with what Rails itself uses to prevent
-        double-requires.
+        Noise is bad.

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 0.97.0
+GIT_VERSION = 1.0.0pre1

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.97.0.GIT
+DEF_VER=v1.0.0pre1.GIT
 
 LF='
 '

data/GNUmakefile

@@ -62,7 +62,7 @@ NEWS: GIT-VERSION-FILE
 	$(RAKE) -s news_rdoc > $@+
 	mv $@+ $@
 
-SINCE = 0.96.0
+SINCE = 0.97.0
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)

data/README

@@ -86,7 +86,7 @@ fast applications.
 
 == License
 
-\Rainbows! is copyright 2009 by all contributors (see logs in git).
+\Rainbows! is copyright 2009,2010 by all contributors (see logs in git).
 It is based on Mongrel and Unicorn and carries the same license.
 
 Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed

data/bin/rainbows

@@ -5,16 +5,13 @@ require 'rainbows'
 require 'optparse'
 
 ENV["RACK_ENV"] ||= "development"
-daemonize = false
-listeners = []
-options = { :listeners => listeners }
-host, port = Unicorn::Const::DEFAULT_HOST, Unicorn::Const::DEFAULT_PORT
-set_listener = false
+rackup_opts = Unicorn::Configurator::RACKUP
+options = rackup_opts[:options]
 
 opts = OptionParser.new("", 24, '  ') do |opts|
-  opts.banner = "Usage: #{File.basename($0)} " \
-                "[ruby options] [unicorn options] [rackup config file]"
-
+  cmd = File.basename($0)
+  opts.banner = "Usage: #{cmd} " \
+                "[ruby options] [#{cmd} options] [rackup config file]"
   opts.separator "Ruby options:"
 
   lineno = 1
@@ -41,20 +38,20 @@ opts = OptionParser.new("", 24, '  ') do |opts|
     require library
   end
 
-  opts.separator "Rainbows!/Unicorn options:"
+  opts.separator "#{cmd} options:"
 
   # some of these switches exist for rackup command-line compatibility,
 
   opts.on("-o", "--host HOST",
           "listen on HOST (default: #{Unicorn::Const::DEFAULT_HOST})") do |h|
-    host = h
-    set_listener = true
+    rackup_opts[:host] = h
+    rackup_opts[:set_listener] = true
   end
 
   opts.on("-p", "--port PORT",
           "use PORT (default: #{Unicorn::Const::DEFAULT_PORT})") do |p|
-    port = p.to_i
-    set_listener = true
+    rackup_opts[:port] = p.to_i
+    rackup_opts[:set_listener] = true
   end
 
   opts.on("-E", "--env RACK_ENV",
@@ -63,7 +60,7 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   end
 
   opts.on("-D", "--daemonize", "run daemonized in the background") do |d|
-    daemonize = d ? true : false
+    rackup_opts[:daemonize] = !!d
   end
 
   opts.on("-P", "--pid FILE", "DEPRECATED") do |f|
@@ -82,11 +79,10 @@ opts = OptionParser.new("", 24, '  ') do |opts|
           "listen on HOST:PORT or PATH",
           "this may be specified multiple times",
           "(default: #{Unicorn::Const::DEFAULT_LISTEN})") do |address|
-    listeners << address
+    options[:listeners] << address
   end
 
-  opts.on("-c", "--config-file FILE",
-          "Rainbows!/Unicorn-specific config file") do |f|
+  opts.on("-c", "--config-file FILE", "Rainbows!-specific config file") do |f|
     options[:config_file] = f
   end
 
@@ -111,16 +107,15 @@ opts = OptionParser.new("", 24, '  ') do |opts|
 end
 
 app = Unicorn.builder(ARGV[0] || 'config.ru', opts)
-listeners << "#{host}:#{port}" if set_listener
 
 if $DEBUG
   require 'pp'
   pp({
     :unicorn_options => options,
     :app => app,
-    :daemonize => daemonize,
+    :daemonize => rackup_opts[:daemonize],
   })
 end
 
-Unicorn::Launcher.daemonize!(options) if daemonize
+Unicorn::Launcher.daemonize!(options) if rackup_opts[:daemonize]
 Rainbows.run(app, options)

data/lib/rainbows/actor_spawn.rb

@@ -1,29 +1,27 @@
 # -*- encoding: binary -*-
 
 require 'actor'
-module Rainbows
 
-  # Actor concurrency model for Rubinius.  We can't seem to get message
-  # passing working right, so we're throwing a Mutex into the mix for
-  # now.  Hopefully somebody can fix things for us.  Currently, this is
-  # exactly the same as the ThreadSpawn model since we don't use the
-  # message passing capabilities of the Actor model (and even then
-  # it wouldn't really make sense since Actors in Rubinius are just
-  # Threads underneath and our ThreadSpawn model is one layer of
-  # complexity less.
-  #
-  # This is different from the Revactor one which is not prone to race
-  # conditions within the same process at all (since it uses Fibers).
-  module ActorSpawn
-    include ThreadSpawn
+# Actor concurrency model for Rubinius.  We can't seem to get message
+# passing working right, so we're throwing a Mutex into the mix for
+# now.  Hopefully somebody can fix things for us.  Currently, this is
+# exactly the same as the ThreadSpawn model since we don't use the
+# message passing capabilities of the Actor model (and even then
+# it wouldn't really make sense since Actors in Rubinius are just
+# Threads underneath and our ThreadSpawn model is one layer of
+# complexity less.
+#
+# This is different from the Revactor one which is not prone to race
+# conditions within the same process at all (since it uses Fibers).
+module Rainbows::ActorSpawn
+  include Rainbows::ThreadSpawn
 
-    # runs inside each forked worker, this sits around and waits
-    # for connections and doesn't die until the parent dies (or is
-    # given a INT, QUIT, or TERM signal)
-    def worker_loop(worker) # :nodoc:
-      Const::RACK_DEFAULTS["rack.multithread"] = true # :(
-      init_worker_process(worker)
-      accept_loop(Actor)
-    end
+  # runs inside each forked worker, this sits around and waits
+  # for connections and doesn't die until the parent dies (or is
+  # given a INT, QUIT, or TERM signal)
+  def worker_loop(worker) # :nodoc:
+    Rainbows::Const::RACK_DEFAULTS["rack.multithread"] = true # :(
+    init_worker_process(worker)
+    accept_loop(Actor)
   end
 end