ebb 0.1.0 → 0.2.0

data/libev/ev_vars.h

@@ -1,3 +1,42 @@
+/*
+ * loop member variable declarations
+ *
+ * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ * 
+ *   1.  Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ * 
+ *   2.  Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
+ * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
+ * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
+ * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License ("GPL") version 2 or any later version,
+ * in which case the provisions of the GPL are applicable instead of
+ * the above. If you wish to allow the use of your version of this file
+ * only under the terms of the GPL and not to allow others to use your
+ * version of this file under the BSD license, indicate your decision
+ * by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL. If you do not delete the
+ * provisions above, a recipient may use your version of this file under
+ * either the BSD or the GPL.
+ */
+
 #define VARx(type,name) VAR(name, type name)
 
 VARx(ev_tstamp, now_floor) /* last time we refreshed rt_time */
@@ -16,6 +55,9 @@ VARx(ev_tstamp, backend_fudge) /* assumed typical timer resolution */
 VAR (backend_modify, void (*backend_modify)(EV_P_ int fd, int oev, int nev))
 VAR (backend_poll  , void (*backend_poll)(EV_P_ ev_tstamp timeout))
 
+VAR (evpipe, int evpipe [2])
+VARx(ev_io, pipeev)
+
 #if !defined(_WIN32) || EV_GENWRAP
 VARx(pid_t, curpid)
 #endif
@@ -98,6 +140,13 @@ VARx(int, forkmax)
 VARx(int, forkcnt)
 #endif
 
+VARx(EV_ATOMIC_T, gotasync)
+#if EV_ASYNC_ENABLE || EV_GENWRAP
+VARx(struct ev_async **, asyncs)
+VARx(int, asyncmax)
+VARx(int, asynccnt)
+#endif
+
 #if EV_USE_INOTIFY || EV_GENWRAP
 VARx(int, fs_fd)
 VARx(ev_io, fs_w)

data/libev/ev_win32.c

@@ -1,32 +1,40 @@
 /*
- * libev win32 compatibility cruft
+ * libev win32 compatibility cruft (_not_ a backend)
  *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ * 
+ *   1.  Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ * 
+ *   2.  Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
+ * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
+ * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
+ * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License ("GPL") version 2 or any later version,
+ * in which case the provisions of the GPL are applicable instead of
+ * the above. If you wish to allow the use of your version of this file
+ * only under the terms of the GPL and not to allow others to use your
+ * version of this file under the BSD license, indicate your decision
+ * by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL. If you do not delete the
+ * provisions above, a recipient may use your version of this file under
+ * either the BSD or the GPL.
  */
 
 #ifdef _WIN32

data/libev/ev_wrap.h

@@ -13,6 +13,8 @@
 #define backend_fudge ((loop)->backend_fudge)
 #define backend_modify ((loop)->backend_modify)
 #define backend_poll ((loop)->backend_poll)
+#define evpipe ((loop)->evpipe)
+#define pipeev ((loop)->pipeev)
 #define curpid ((loop)->curpid)
 #define postfork ((loop)->postfork)
 #define vec_ri ((loop)->vec_ri)
@@ -61,6 +63,10 @@
 #define forks ((loop)->forks)
 #define forkmax ((loop)->forkmax)
 #define forkcnt ((loop)->forkcnt)
+#define gotasync ((loop)->gotasync)
+#define asyncs ((loop)->asyncs)
+#define asyncmax ((loop)->asyncmax)
+#define asynccnt ((loop)->asynccnt)
 #define fs_fd ((loop)->fs_fd)
 #define fs_w ((loop)->fs_w)
 #define fs_hash ((loop)->fs_hash)
@@ -78,6 +84,8 @@
 #undef backend_fudge
 #undef backend_modify
 #undef backend_poll
+#undef evpipe
+#undef pipeev
 #undef curpid
 #undef postfork
 #undef vec_ri
@@ -126,6 +134,10 @@
 #undef forks
 #undef forkmax
 #undef forkcnt
+#undef gotasync
+#undef asyncs
+#undef asyncmax
+#undef asynccnt
 #undef fs_fd
 #undef fs_w
 #undef fs_hash

data/ruby_lib/ebb.rb

@@ -3,33 +3,37 @@
 # See README file for details.
 require 'stringio'
 module Ebb
+  VERSION = "0.2.0"
   LIBDIR = File.dirname(__FILE__)
-  require Ebb::LIBDIR + '/../src/ebb_ext'
   autoload :Runner, LIBDIR + '/ebb/runner'
+  autoload :FFI, LIBDIR + '/../src/ebb_ext'
   
   def self.start_server(app, options={})
-    port = (options[:port] || 4001).to_i
-    if options.has_key?(:threaded_processing)
-      threaded_processing = options[:threaded_processing] ? true : false
+    if options.has_key?(:fileno)
+      fd = options[:fileno].to_i
+      FFI::server_listen_on_fd(fd)
+      log.puts "Ebb is listening on file descriptor #{fd}"
+    elsif options.has_key?(:unix_socket)
+      socketfile = options[:unix_socket]
+      FFI::server_listen_on_unix_socket(socketfile)
+      log.puts "Ebb is listening on unix socket #{socketfile}"
     else
-      threaded_processing = true
+      port = (options[:port] || 4001).to_i
+      FFI::server_listen_on_port(port)
+      log.puts "Ebb is listening at http://0.0.0.0:#{port}/"
     end
+    log.puts "Ebb PID #{Process.pid}"
     
-    Client::BASE_ENV['rack.multithread'] = threaded_processing
-    
-    FFI::server_listen_on_port(port)
     @running = true
     trap('INT')  { stop_server }
     
-    log.puts "Ebb listening at http://0.0.0.0:#{port}/ (#{threaded_processing ? 'threaded' : 'sequential'} processing, PID #{Process.pid})"
-    
     while @running
       FFI::server_process_connections()
-      while client = FFI::waiting_clients.shift
-        if threaded_processing
-          Thread.new(client) { |c| process(app, c) }
-        else
+      while client = FFI::server_waiting_clients.shift
+        if app.respond_to?(:deferred?) and !app.deferred?(client.env)
           process(app, client)
+        else
+          Thread.new(client) { |c| process(app, c) }
         end
       end
     end
@@ -45,34 +49,40 @@ module Ebb
   end
   
   def self.process(app, client)
-    begin
-      status, headers, body = app.call(client.env)
-    rescue
-      raise if $DEBUG
-      status = 500
-      headers = {'Content-Type' => 'text/plain'}
-      body = "Internal Server Error\n"
-    end
+    #p client.env
+    status, headers, body = app.call(client.env)
     
+    # Write the status
     client.write_status(status)
     
-    if headers.respond_to?(:[]=) and body.respond_to?(:length) and status != 304
-      headers['Connection'] = 'close'
+    # Add Content-Length to the headers.
+    if headers['Content-Length'].nil? and
+       headers.respond_to?(:[]=) and 
+       body.respond_to?(:length) and 
+       status != 304
+    then
       headers['Content-Length'] = body.length.to_s
     end
     
+    # Decide if we should keep the connection alive or not
+    if headers['Connection'].nil?
+      if headers['Content-Length'] and client.should_keep_alive?
+        headers['Connection'] = 'Keep-Alive'
+      else
+        headers['Connection'] = 'close'
+      end
+    end
+    
+    # Write the headers
     headers.each { |field, value| client.write_header(field, value) }
-    client.write("\r\n")
     
+    # Write the body
     if body.kind_of?(String)
-      client.write(body)
-      client.body_written()
-      client.begin_transmission()
+      client.write_body(body)
     else
-      client.begin_transmission()
-      body.each { |p| client.write(p) }
-      client.body_written()
+      body.each { |p| client.write_body(p) }
     end
+    
   rescue => e
     log.puts "Ebb Error! #{e.class}  #{e.message}"
     log.puts e.backtrace.join("\n")
@@ -88,16 +98,12 @@ module Ebb
     @@log
   end
   
-  # This array is created and manipulated in the C extension.
-  def FFI.waiting_clients
-    @waiting_clients
-  end
-  
   class Client
+    attr_reader :fd, :body_head, :content_length
     BASE_ENV = {
       'SERVER_NAME' => '0.0.0.0',
       'SCRIPT_NAME' => '',
-      'SERVER_SOFTWARE' => "Ebb #{Ebb::VERSION}",
+      'SERVER_SOFTWARE' => "Ebb-Ruby #{Ebb::VERSION}",
       'SERVER_PROTOCOL' => 'HTTP/1.1',
       'rack.version' => [0, 1],
       'rack.errors' => STDERR,
@@ -107,9 +113,11 @@ module Ebb
     }
     
     def env
-      env = FFI::client_env(self).update(BASE_ENV)
-      env['rack.input'] = RequestBody.new(self)
-      env
+      @env ||= begin
+        env = FFI::client_env(self).update(BASE_ENV)
+        env['rack.input'] = RequestBody.new(self)
+        env
+      end
     end
     
     def write_status(status)
@@ -117,8 +125,8 @@ module Ebb
       FFI::client_write_status(self, s, HTTP_STATUS_CODES[s])
     end
     
-    def write(data)
-      FFI::client_write(self, data)
+    def write_body(data)
+      FFI::client_write_body(self, data)
     end
     
     def write_header(field, value)
@@ -127,50 +135,53 @@ module Ebb
       end
     end
     
-    def body_written
-      FFI::client_set_body_written(self, true)
+    def release
+      FFI::client_release(self)
     end
     
-    def begin_transmission
-      FFI::client_begin_transmission(self)
+    def set_keep_alive
+      FFI::client_set_keep_alive(self)
     end
     
-    def release
-      FFI::client_release(self)
+    def should_keep_alive?
+      if env['HTTP_VERSION'] == 'HTTP/1.0' 
+        return true if env['HTTP_CONNECTION'] =~ /Keep-Alive/i
+      else
+        return true unless env['HTTP_CONNECTION'] =~ /close/i
+      end
+      false
     end
   end
   
   class RequestBody
     def initialize(client)
-      @client = client
+      @content_length = client.content_length
+      if client.body_head
+        @body_head = StringIO.new(client.body_head)
+        if @body_head.length < @content_length
+          @socket = IO.new(client.fd)
+        end
+      end
+      @total_read = 0
     end
     
     def read(len = nil)
-      if @io
-        @io.read(len)
-      else
-        if len.nil?
-          s = ''
-          while(chunk = read(10*1024)) do
-            s << chunk
-          end
-          s
-        else
-          FFI::client_read_input(@client, len)
-        end
+      to_read =  len.nil? ? @content_length - @total_read : min(len, @content_length - @total_read)
+      return nil if to_read == 0 or @body_head.nil?
+      unless out = @body_head.read(to_read)
+        return nil if @socket.nil?
+        out = @socket.read(to_read)
       end
+      @total_read += out.length
+      out
     end
     
     def gets
-      io.gets
+      raise NotImplemented
     end
     
     def each(&block)
-      io.each(&block)
-    end
-    
-    def io
-      @io ||= StringIO.new(read)
+      raise NotImplemented
     end
   end
   
@@ -215,3 +226,19 @@ module Ebb
     505  => 'HTTP Version not supported'
   }.freeze
 end
+
+
+module Rack
+  module Handler
+    module Ebb
+      def self.run(app, options={})
+        ::Ebb.start_server(app, options)
+      end
+    end
+  end
+end
+
+# cause i don't want to create an array
+def min(a,b)
+  a > b ? b : a
+end

data/ruby_lib/ebb/runner.rb

@@ -58,8 +58,7 @@ module Ebb
       @parser = OptionParser.new
       @options = {
         :port => 4001,
-        :timeout => 60,
-        :threaded_processing => true
+        :timeout => 60
       }
     end
     
@@ -69,8 +68,8 @@ module Ebb
       extra_options if respond_to?(:extra_options)
       
       @parser.separator ""
-      #  opts.on("-s", "--socket SOCKET", "listen on socket") { |socket| options[:socket] = socket }
-      @parser.on("-p", "--port PORT", "(default: #{@options[:port]})") { |p| @options[:port]=p }
+      @parser.on("-p", "--port PORT", "(default: #{@options[:port]})") { |p| @options[:port] = p }
+      @parser.on("-s", "--socket SOCKET", "listen on unix domain socket") { |socket| options[:unix_socket] = socket }
       @parser.on("-d", "--daemonize", "Daemonize") { @options[:daemonize] = true }
       @parser.on("-l", "--log-file FILE", "File to redirect output") { |f| @options[:log_file]=f }
       @parser.on("-P", "--pid-file FILE", "File to store PID") { |f| @options[:pid_file]=f }
@@ -82,7 +81,7 @@ module Ebb
         exit
       end
       @parser.on_tail('-v', '--version', "Show version") do
-        Ebb.log.puts "Ebb #{Ebb::VERSION}"
+        Ebb.log.puts Ebb::Client::BASE_ENV['SERVER_SOFTWARE']
         exit
       end