unicorn 0.9.1 → 0.9.2

data/ext/{unicorn/http11/http11_parser.rl → unicorn_http/unicorn_http.rl}

@@ -2,8 +2,8 @@
  * Copyright (c) 2005 Zed A. Shaw
  * You can redistribute it and/or modify it under the same terms as Ruby.
  */
-#ifndef http11_parser_h
-#define http11_parser_h
+#ifndef unicorn_http_h
+#define unicorn_http_h
 
 #include <sys/types.h>
 
@@ -105,7 +105,7 @@ static void downcase_char(char *c)
     fbreak;
   }
 
-  include http_parser_common "http11_parser_common.rl";
+  include unicorn_http_common "unicorn_http_common.rl";
 }%%
 
 /** Data **/
@@ -155,4 +155,4 @@ static int http_parser_has_error(http_parser *parser) {
 static int http_parser_is_finished(http_parser *parser) {
   return parser->cs == http_parser_first_final;
 }
-#endif /* http11_parser_h */
+#endif /* unicorn_http_h */

data/ext/{unicorn/http11/http11_parser_common.rl → unicorn_http/unicorn_http_common.rl}

@@ -1,6 +1,6 @@
 %%{
-  
-  machine http_parser_common;
+
+  machine unicorn_http_common;
 
 #### HTTP PROTOCOL GRAMMAR
 # line endings

data/lib/unicorn.rb

@@ -1,5 +1,4 @@
 require 'fcntl'
-require 'tempfile'
 require 'unicorn/socket_helper'
 autoload :Rack, 'rack'
 
@@ -66,7 +65,7 @@ module Unicorn
       0 => $0.dup,
     }
 
-    class Worker < Struct.new(:nr, :tempfile)
+    class Worker < Struct.new(:nr, :tmp)
       # worker objects may be compared to just plain numbers
       def ==(other_nr)
         self.nr == other_nr
@@ -332,7 +331,7 @@ module Unicorn
             self.pid = pid.chomp('.oldbin') if pid
             proc_name 'master'
           else
-            worker = WORKERS.delete(wpid) and worker.tempfile.close rescue nil
+            worker = WORKERS.delete(wpid) and worker.tmp.close rescue nil
             logger.info "reaped #{status.inspect} " \
                         "worker=#{worker.nr rescue 'unknown'}"
           end
@@ -392,16 +391,16 @@ module Unicorn
     end
 
     # forcibly terminate all workers that haven't checked in in timeout
-    # seconds.  The timeout is implemented using an unlinked tempfile
+    # seconds.  The timeout is implemented using an unlinked File
     # shared between the parent process and each worker.  The worker
-    # runs File#chmod to modify the ctime of the tempfile.  If the ctime
+    # runs File#chmod to modify the ctime of the File.  If the ctime
     # is stale for >timeout seconds, then we'll kill the corresponding
     # worker.
     def murder_lazy_workers
       diff = stat = nil
       WORKERS.dup.each_pair do |wpid, worker|
         stat = begin
-          worker.tempfile.stat
+          worker.tmp.stat
         rescue => e
           logger.warn "worker=#{worker.nr} PID:#{wpid} stat error: #{e.inspect}"
           kill_worker(:QUIT, wpid)
@@ -425,9 +424,7 @@ module Unicorn
           SIG_QUEUE << :QUIT # forcibly emulate SIGQUIT
           return
         end
-        tempfile = Tempfile.new(nil) # as short as possible to save dir space
-        tempfile.unlink # don't allow other processes to find or see it
-        worker = Worker.new(worker_nr, tempfile)
+        worker = Worker.new(worker_nr, Unicorn::Util.tmpio)
         before_fork.call(self, worker)
         WORKERS[fork { worker_loop(worker) }] = worker
       end
@@ -482,10 +479,10 @@ module Unicorn
       proc_name "worker[#{worker.nr}]"
       START_CTX.clear
       init_self_pipe!
-      WORKERS.values.each { |other| other.tempfile.close! rescue nil }
+      WORKERS.values.each { |other| other.tmp.close rescue nil }
       WORKERS.clear
       LISTENERS.each { |sock| sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) }
-      worker.tempfile.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+      worker.tmp.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
       after_fork.call(self, worker) # can drop perms
       self.timeout /= 2.0 # halve it for select()
       build_app! unless preload_app
@@ -505,7 +502,7 @@ module Unicorn
       ppid = master_pid
       init_worker_process(worker)
       nr = 0 # this becomes negative if we need to reopen logs
-      alive = worker.tempfile # tempfile is our lifeline to the master process
+      alive = worker.tmp # tmp is our lifeline to the master process
       ready = LISTENERS
       t = ti = 0
 
@@ -570,7 +567,7 @@ module Unicorn
       begin
         Process.kill(signal, wpid)
       rescue Errno::ESRCH
-        worker = WORKERS.delete(wpid) and worker.tempfile.close rescue nil
+        worker = WORKERS.delete(wpid) and worker.tmp.close rescue nil
       end
     end
 

data/lib/unicorn/app/exec_cgi.rb

@@ -42,11 +42,8 @@ module Unicorn::App
 
     # Calls the app
     def call(env)
-      out, err = Tempfile.new(nil), Tempfile.new(nil)
-      out.unlink
-      err.unlink
+      out, err = Unicorn::Util.tmpio, Unicorn::Util.tmpio
       inp = force_file_input(env)
-      out.sync = err.sync = true
       pid = fork { run_child(inp, out, err, env) }
       inp.close
       pid, status = Process.waitpid2(pid)
@@ -125,12 +122,9 @@ module Unicorn::App
       if inp.size == 0 # inp could be a StringIO or StringIO-like object
         ::File.open('/dev/null', 'rb')
       else
-        tmp = Tempfile.new(nil)
-        tmp.unlink
-        tmp.binmode
-        tmp.sync = true
+        tmp = Unicorn::Util.tmpio
 
-        buf = Z.dup
+        buf = Unicorn::Z.dup
         while inp.read(CHUNK_SIZE, buf)
           tmp.syswrite(buf)
         end

data/lib/unicorn/chunked_reader.rb

@@ -2,7 +2,7 @@
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
 require 'unicorn'
-require 'unicorn/http11'
+require 'unicorn_http'
 
 module Unicorn
   class ChunkedReader
@@ -32,23 +32,6 @@ module Unicorn
       buf
     end
 
-    def gets
-      line = nil
-      begin
-        line = readpartial(Const::CHUNK_SIZE)
-        begin
-          if line.sub!(%r{\A(.*?#{$/})}, Z)
-            @chunk_left += line.size
-            @buf = @buf ? (line << @buf) : line
-            return $1.dup
-          end
-          line << readpartial(Const::CHUNK_SIZE)
-        end while true
-      rescue EOFError
-        return line
-      end
-    end
-
   private
 
     def last_block(max = nil)

data/lib/unicorn/const.rb

@@ -5,7 +5,7 @@ module Unicorn
   # gave about a 3% to 10% performance improvement over using the strings directly.
   # Symbols did not really improve things much compared to constants.
   module Const
-    UNICORN_VERSION="0.9.1".freeze
+    UNICORN_VERSION="0.9.2".freeze
 
     DEFAULT_HOST = "0.0.0.0".freeze # default TCP listen host address
     DEFAULT_PORT = "8080".freeze    # default TCP listen port

data/lib/unicorn/http_request.rb

@@ -1,7 +1,7 @@
 require 'stringio'
 
 # compiled extension
-require 'unicorn/http11'
+require 'unicorn_http'
 
 module Unicorn
   class HttpRequest
@@ -81,16 +81,14 @@ module Unicorn
       PARAMS[Const::RACK_INPUT] = if (body = PARAMS.delete(:http_body))
         length = PARAMS[Const::CONTENT_LENGTH].to_i
 
-        if te = PARAMS[Const::HTTP_TRANSFER_ENCODING]
-          if /\Achunked\z/i =~ te
-            socket = ChunkedReader.new(PARAMS, socket, body)
-            length = body = nil
-          end
+        if /\Achunked\z/i =~ PARAMS[Const::HTTP_TRANSFER_ENCODING]
+          socket = ChunkedReader.new(PARAMS, socket, body)
+          length = body = nil
         end
 
         TeeInput.new(socket, length, body)
       else
-        NULL_IO.closed? ? NULL_IO.reopen(Z) : NULL_IO
+        NULL_IO
       end
 
       PARAMS.update(DEFAULTS)

data/lib/unicorn/tee_input.rb

@@ -1,10 +1,8 @@
 # Copyright (c) 2009 Eric Wong
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
-require 'tempfile'
-
 # acts like tee(1) on an input input to provide a input-like stream
-# while providing rewindable semantics through a Tempfile/StringIO
+# while providing rewindable semantics through a File/StringIO
 # backing store.  On the first pass, the input is only read on demand
 # so your Rack application can use input notification (upload progress
 # and like).  This should fully conform to the Rack::InputWrapper
@@ -16,10 +14,7 @@ module Unicorn
   class TeeInput
 
     def initialize(input, size, body)
-      @tmp = Tempfile.new(nil)
-      @tmp.unlink
-      @tmp.binmode
-      @tmp.sync = true
+      @tmp = Unicorn::Util.tmpio
 
       if body
         @tmp.write(body)
@@ -73,22 +68,25 @@ module Unicorn
       @input or return @tmp.gets
       nil == $/ and return read
 
-      line = nil
-      if @tmp.pos < @tmp.stat.size
-        line = @tmp.gets # cannot be nil here
-        $/ == line[-$/.size, $/.size] and return line
-
-        # half the line was already read, and the rest of has not been read
-        if buf = @input.gets
-          @tmp.write(buf)
-          line << buf
-        else
-          @input = nil
-        end
-      elsif line = @input.gets
-        @tmp.write(line)
+      orig_size = @tmp.stat.size
+      if @tmp.pos == orig_size
+        tee(Const::CHUNK_SIZE, Z.dup) or return nil
+        @tmp.seek(orig_size)
       end
 
+      line = @tmp.gets # cannot be nil here since size > pos
+      $/ == line[-$/.size, $/.size] and return line
+
+      # unlikely, if we got here, then @tmp is at EOF
+      begin
+        orig_size = @tmp.stat.size
+        tee(Const::CHUNK_SIZE, Z.dup) or break
+        @tmp.seek(orig_size)
+        line << @tmp.gets
+        $/ == line[-$/.size, $/.size] and return line
+        # @tmp is at EOF again here, retry the loop
+      end while true
+
       line
     end
 

data/lib/unicorn/trailer_parser.rb

@@ -1,7 +1,7 @@
 # Copyright (c) 2009 Eric Wong
 # You can redistribute it and/or modify it under the same terms as Ruby.
 require 'unicorn'
-require 'unicorn/http11'
+require 'unicorn_http'
 
 # Eventually I should integrate this into HttpParser...
 module Unicorn

data/lib/unicorn/util.rb

@@ -1,4 +1,5 @@
 require 'fcntl'
+require 'tmpdir'
 
 module Unicorn
   class Util
@@ -39,6 +40,22 @@ module Unicorn
         nr
       end
 
+      # creates and returns a new File object.  The File is unlinked
+      # immediately, switched to binary mode, and userspace output
+      # buffering is disabled
+      def tmpio
+        fp = begin
+          File.open("#{Dir::tmpdir}/#{rand}",
+                    File::RDWR|File::CREAT|File::EXCL, 0600)
+        rescue Errno::EEXIST
+          retry
+        end
+        File.unlink(fp.path)
+        fp.binmode
+        fp.sync = true
+        fp
+      end
+
     end
 
   end

data/test/test_helper.rb

@@ -27,7 +27,7 @@ require 'tempfile'
 require 'fileutils'
 require 'logger'
 require 'unicorn'
-require 'unicorn/http11'
+require 'unicorn_http'
 
 if ENV['DEBUG']
   require 'ruby-debug'

data/test/unit/test_chunked_reader.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'unicorn'
-require 'unicorn/http11'
+require 'unicorn_http'
 require 'tempfile'
 require 'io/nonblock'
 require 'digest/sha1'
@@ -53,63 +53,6 @@ class TestChunkedReader < Test::Unit::TestCase
     assert_raises(EOFError) { cr.readpartial(8192) }
   end
 
-  def test_gets1
-    cr = bin_reader("4\r\nasdf\r\n0\r\n")
-    STDOUT.sync = true
-    assert_equal 'asdf', cr.gets
-    assert_raises(EOFError) { cr.readpartial(8192) }
-  end
-
-  def test_gets2
-    cr = bin_reader("4\r\nasd\n\r\n0\r\n\r\n")
-    assert_equal "asd\n", cr.gets
-    assert_nil cr.gets
-  end
-
-  def test_gets3
-    max = Unicorn::Const::CHUNK_SIZE * 2
-    str = ('a' * max).freeze
-    first = 5
-    last = str.size - first
-    cr = bin_reader(
-      "#{'%x' % first}\r\n#{str[0, first]}\r\n" \
-      "#{'%x' % last}\r\n#{str[-last, last]}\r\n" \
-      "0\r\n")
-    assert_equal str, cr.gets
-    assert_nil cr.gets
-  end
-
-  def test_readpartial_gets_mixed1
-    max = Unicorn::Const::CHUNK_SIZE * 2
-    str = ('a' * max).freeze
-    first = 5
-    last = str.size - first
-    cr = bin_reader(
-      "#{'%x' % first}\r\n#{str[0, first]}\r\n" \
-      "#{'%x' % last}\r\n#{str[-last, last]}\r\n" \
-      "0\r\n")
-    partial = cr.readpartial(16384)
-    assert String === partial
-
-    len = max - partial.size
-    assert_equal(str[-len, len], cr.gets)
-    assert_raises(EOFError) { cr.readpartial(1) }
-    assert_nil cr.gets
-  end
-
-  def test_gets_mixed_readpartial
-    max = 10
-    str = ("z\n" * max).freeze
-    first = 5
-    last = str.size - first
-    cr = bin_reader(
-      "#{'%x' % first}\r\n#{str[0, first]}\r\n" \
-      "#{'%x' % last}\r\n#{str[-last, last]}\r\n" \
-      "0\r\n")
-    assert_equal("z\n", cr.gets)
-    assert_equal("z\n", cr.gets)
-  end
-
   def test_dd
     cr = bin_reader("6\r\nhello\n\r\n")
     tmp = Tempfile.new('test_dd')
@@ -138,7 +81,7 @@ class TestChunkedReader < Test::Unit::TestCase
         exit 0
       end while true
     }
-    assert_equal "hello\n", cr.gets
+    assert_equal "hello\n", cr.readpartial(6)
     sha1 = Digest::SHA1.new
     buf = Unicorn::Z.dup
     begin

data/test/unit/test_tee_input.rb

@@ -0,0 +1,66 @@
+# encoding: binary
+require 'test/unit'
+require 'digest/sha1'
+require 'unicorn'
+
+class TestTeeInput < Test::Unit::TestCase
+
+  def setup
+    @rs = $/
+    @env = {}
+    @rd, @wr = IO.pipe
+    @rd.sync = @wr.sync = true
+    @start_pid = $$
+  end
+
+  def teardown
+    return if $$ != @start_pid
+    $/ = @rs
+    @rd.close rescue nil
+    @wr.close rescue nil
+    begin
+      Process.wait
+    rescue Errno::ECHILD
+      break
+    end while true
+  end
+
+  def test_gets_long
+    ti = Unicorn::TeeInput.new(@rd, nil, "hello")
+    status = line = nil
+    pid = fork {
+      @rd.close
+      3.times { @wr.write("ffff" * 4096) }
+      @wr.write "#$/foo#$/"
+      @wr.close
+    }
+    @wr.close
+    assert_nothing_raised { line = ti.gets }
+    assert_equal(4096 * 4 * 3 + 5 + $/.size, line.size)
+    assert_equal("hello" << ("ffff" * 4096 * 3) << "#$/", line)
+    assert_nothing_raised { line = ti.gets }
+    assert_equal "foo#$/", line
+    assert_nil ti.gets
+    assert_nothing_raised { pid, status = Process.waitpid2(pid) }
+    assert status.success?
+  end
+
+  def test_gets_short
+    ti = Unicorn::TeeInput.new(@rd, nil, "hello")
+    status = line = nil
+    pid = fork {
+      @rd.close
+      @wr.write "#$/foo"
+      @wr.close
+    }
+    @wr.close
+    assert_nothing_raised { line = ti.gets }
+    assert_equal("hello#$/", line)
+    assert_nothing_raised { line = ti.gets }
+    assert_equal "foo", line
+    assert_nil ti.gets
+    assert_nothing_raised { pid, status = Process.waitpid2(pid) }
+    assert status.success?
+  end
+
+end