ebb 0.2.1 → 0.3.0

data/libev/event.h

@@ -0,0 +1,152 @@
+/*
+ * libevent compatibility header, only core events supported
+ *
+ * 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.
+ */
+
+#ifndef EVENT_H__
+#define EVENT_H__
+
+#ifdef EV_H
+# include EV_H
+#else
+# include "ev.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct event_base;
+
+#define EVLIST_TIMEOUT  0x01
+#define EVLIST_INSERTED 0x02
+#define EVLIST_SIGNAL   0x04
+#define EVLIST_ACTIVE   0x08
+#define EVLIST_INTERNAL 0x10
+#define EVLIST_INIT     0x80
+
+struct event
+{
+  /* libev watchers we map onto */
+  union {
+    struct ev_io io;
+    struct ev_signal sig;
+  } iosig;
+  struct ev_timer to;
+
+  /* compatibility slots */
+  struct event_base *ev_base;
+  void (*ev_callback)(int, short, void *arg);
+  void *ev_arg;
+  int ev_fd;
+  int ev_pri;
+  int ev_res;
+  int ev_flags;
+  short ev_events;
+};
+
+#define EV_PERSIST                 0x10
+
+#define EVENT_SIGNAL(ev)           ((int) (ev)->ev_fd)
+#define EVENT_FD(ev)               ((int) (ev)->ev_fd)
+
+#define event_initialized(ev)      ((ev)->ev_flags & EVLIST_INIT)
+
+#define evtimer_add(ev,tv)         event_add (ev, tv)
+#define evtimer_set(ev,cb,data)    event_set (ev, -1, 0, cb, data)
+#define evtimer_del(ev)            event_del (ev)
+#define evtimer_pending(ev,tv)     event_pending (ev, EV_TIMEOUT, tv)
+#define evtimer_initialized(ev)    event_initialized (ev)
+
+#define timeout_add(ev,tv)         evtimer_add (ev, tv)
+#define timeout_set(ev,cb,data)    evtimer_set (ev, cb, data)
+#define timeout_del(ev)            evtimer_del (ev)
+#define timeout_pending(ev,tv)     evtimer_pending (ev, tv)
+#define timeout_initialized(ev)    evtimer_initialized (ev)
+
+#define signal_add(ev,tv)          event_add (ev, tv)
+#define signal_set(ev,sig,cb,data) event_set (ev, sig, EV_SIGNAL | EV_PERSIST, cb, data)
+#define signal_del(ev)             event_del (ev)
+#define signal_pending(ev,tv)      event_pending (ev, EV_SIGNAL, tv)
+#define signal_initialized(ev)     event_initialized (ev)
+
+const char *event_get_version (void);
+const char *event_get_method (void);
+
+void *event_init (void);
+void event_base_free (struct event_base *base);
+
+#define EVLOOP_ONCE      EVLOOP_ONESHOT
+int event_loop (int);
+int event_loopexit (struct timeval *tv);
+int event_dispatch (void);
+
+#define _EVENT_LOG_DEBUG 0
+#define _EVENT_LOG_MSG   1
+#define _EVENT_LOG_WARN  2
+#define _EVENT_LOG_ERR   3
+typedef void (*event_log_cb)(int severity, const char *msg);
+void event_set_log_callback(event_log_cb cb);
+
+void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg);
+int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv);
+
+int event_add (struct event *ev, struct timeval *tv);
+int event_del (struct event *ev);
+void event_active (struct event *ev, int res, short ncalls); /* ncalls is being ignored */
+
+int event_pending (struct event *ev, short, struct timeval *tv);
+
+int event_priority_init (int npri);
+int event_priority_set (struct event *ev, int pri);
+
+int event_base_set (struct event_base *base, struct event *ev);
+int event_base_loop (struct event_base *base, int);
+int event_base_loopexit (struct event_base *base, struct timeval *tv);
+int event_base_dispatch (struct event_base *base);
+int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv);
+int event_base_priority_init (struct event_base *base, int fd);
+
+/* next line is different in the libevent+libev version */
+/*libevent-include*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebb
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - ry dahl
@@ -9,66 +9,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-08 00:00:00 +02:00
+date: 2008-08-19 00:00:00 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rack
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: ""
 email: ry at tiny clouds dot org
-executables: 
-- ebb_rails
+executables: []
+
 extensions: 
-- src/extconf.rb
+- ext/extconf.rb
 extra_rdoc_files: []
 
 files: 
-- src/ebb.c
-- src/ebb.h
-- src/parser.c
-- src/parser.h
 - libev/ev_epoll.c
 - libev/ev_select.c
-- libev/ev.h
-- libev/ev_wrap.h
 - libev/ev_poll.c
 - libev/ev.c
+- libev/event.c
 - libev/ev_port.c
 - libev/ev_kqueue.c
 - libev/ev_win32.c
+- libev/ev++.h
+- libev/event.h
+- libev/ev.h
+- libev/ev_wrap.h
 - libev/ev_vars.h
+- lib/ebb/version.rb
+- lib/ebb.rb
+- ext/extconf.rb
+- ext/ebb_ffi.c
 - README
-- src/ebb_ruby.c
-- src/extconf.rb
-- ruby_lib/ebb
-- ruby_lib/ebb/runner.rb
-- ruby_lib/ebb/runner
-- ruby_lib/ebb/runner/rails.rb
-- ruby_lib/rack
-- ruby_lib/rack/adapter
-- ruby_lib/rack/adapter/rails.rb
-- ruby_lib/ebb.rb
-- benchmark/server_test.rb
-- benchmark/application.rb
-- bin/ebb_rails
-- test/basic_test.rb
-- test/env_test.rb
-- test/helper.rb
-- test/ebb_rails_test.rb
+- Rakefile
+- ext/ebb.c
+- ext/ebb.h
+- ext/ebb_request_parser.rl
+- ext/ebb_request_parser.c
+- ext/ebb_request_parser.h
+- ext/rbtree.c
+- ext/rbtree.h
 has_rdoc: false
 homepage: http://ebb.rubyforge.org
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
-- ruby_lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -84,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ebb
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A Web Server

data/benchmark/application.rb

@@ -1,93 +0,0 @@
-DIR = File.dirname(__FILE__)
-
-def fib(n)
-  return 1 if n <= 1
-  fib(n-1) + fib(n-2)
-end
-
-def wait(seconds)
-  n = (seconds / 0.01).to_i
-  n.times do 
-    sleep(0.01)
-    #File.read(DIR + '/yahoo.html') 
-  end
-end
-
-class SimpleApp
-  @@responses = {}
-  
-  def initialize
-    @count = 0
-  end
-  
-  def deferred?(env)
-    false
-  end
-  
-  def call(env)
-    path = env['PATH_INFO'] || env['REQUEST_URI']
-    commands = path.split('/')
-    
-    @count += 1
-    if commands.include?('periodical_activity') and @count % 10 != 1
-      return [200, {'Content-Type'=>'text/plain'}, "quick response!\r\n"]
-    end
-    
-    if commands.include?('fibonacci')
-      n = commands.last.to_i
-      raise "fibonacci called with n <= 0" if n <= 0
-      body = (1..n).to_a.map { |i| fib(i).to_s }.join(' ')
-      status = 200
-    
-    elsif commands.include?('wait')
-      n = commands.last.to_f
-      raise "wait called with n <= 0" if n <= 0
-      wait(n)
-      body = "waited about #{n} seconds"
-      status = 200
-    
-    elsif commands.include?('bytes')
-      n = commands.last.to_i
-      raise "bytes called with n <= 0" if n <= 0
-      body = @@responses[n] || "C"*n
-      status = 200
-      
-    elsif commands.include?('test_post_length')
-      input_body = ""
-      while chunk = env['rack.input'].read(512)
-        input_body << chunk 
-      end
-      if env['CONTENT_LENGTH'].to_i == input_body.length
-        body = "Content-Length matches input length"
-        status = 200
-      else
-        body = "Content-Length doesn't matches input length! 
-          content_length = #{env['CONTENT_LENGTH'].to_i}
-          input_body.length = #{input_body.length}"
-        status = 500
-      end
-    else
-      status = 404
-      body = "Undefined url"
-    end
-    
-    body += "\r\n"
-    headers = {'Content-Type' => 'text/plain', 'Content-Length' => body.length.to_s }
-    [status, headers, body]
-  end
-end
-
-
-if $0 == __FILE__
-#  Thread.new do
-#    i = 0
-#    loop {
-#      puts i += 1
-#      sleep 1
-#    }
-#  end
-
-  require DIR + '/../ruby_lib/ebb'
-  #server = Ebb::start_server(SimpleApp.new, :unix_socket => '/tmp/ebb.sock')
-  server = Ebb::start_server(SimpleApp.new, :port => 4001)
-end

data/benchmark/server_test.rb

@@ -1,193 +0,0 @@
-$: << File.expand_path(File.dirname(__FILE__))
-
-require 'rubygems'
-require 'rack'
-require 'application'
-
-
-class Array
-  def mean
-    @mean ||= sum / length
-  end
-  
-  def variance
-    @variance ||= map { |x| (mean - x)**2 }.sum / length
-  end
-  
-  def stdd
-    @stdd ||= Math.sqrt(variance)
-  end
-  
-  def errors
-    map { |x| (mean - x).abs }
-  end
-  
-  def center_avg
-    return mean if stdd < 10
-    acceptable_error = 0
-    good_points = []
-    while good_points.empty?
-      acceptable_error += stdd
-      good_points = select { |x| (mean - x).abs < acceptable_error }
-    end
-    good_points.mean
-  end
-  
-  def sum
-    inject(0.to_f) { |i, s| s += i }
-  end
-  
-  def rand_each(&block)
-    sort_by{ rand }.each &block
-  end
-end
-
-class ServerTestResults
-  def self.open(filename)
-    if File.readable?(filename)
-      new(Marshal.load(File.read(filename))) 
-    else
-      new
-    end
-  end
-  attr_reader :results
-  def initialize(results = [])
-    @results = results
-  end
-  
-  def benchmark
-    @results.first[:benchmark]
-  end
-  
-  def write(filename='results.dump')
-    puts "writing dump file to #{filename}"
-    File.open(filename, 'w+') do |f|
-      f.write Marshal.dump(@results)
-    end
-  end
-  
-  def <<(r)
-    @results << r
-  end
-  
-  def length
-    @results.length
-  end
-
-  def servers
-    @results.map {|r| r[:server] }.uniq.sort
-  end
-
-  def data(server)
-    server_data = @results.find_all { |r| r[:server] == server }
-    ticks = server_data.map { |d| d[:input] }.uniq
-    datas = []
-    ticks.each do |c|
-      measurements = server_data.find_all { |d| d[:input] == c }.map { |d| d[:rps] }
-      datas << [c, measurements.mean] unless measurements.empty?
-    end
-    datas
-  end
-
-end
-
-class ServerTest
-  attr_reader :name, :port, :app, :pid
-  def initialize(name, port, &start_block)
-    @name = name
-    @port = port.to_i
-  end
-  
-  def <=>(a)
-    @name <=> a.name
-  end
-  
-  def kill
-    Process.kill('KILL', @pid) if @pid
-  end
-  
-  def running?
-    !@pid.nil?
-  end
-  
-  def start
-    puts "Starting #{name}"
-    case name
-    when 'emongrel'
-      @pid = fork { start_emongrel }
-    when 'ebb'
-      @pid = fork { start_ebb }
-    when 'mongrel'
-      @pid = fork { start_mongrel }
-    when 'thin'
-      @pid = fork { start_thin }
-    when 'fcgi'
-      @pid = fork { start_fcgi }
-    end
-  end
-  
-  def app
-    SimpleApp.new
-  end
-  
-  def start_emongrel
-    require 'mongrel'
-    require 'swiftcore/evented_mongrel'
-    ENV['EVENT'] = "1"
-    Rack::Handler::Mongrel.run(app, :Host => '0.0.0.0', :Port => @port.to_i)
-  end
-  
-  def start_ebb
-    require File.dirname(__FILE__) + '/../ruby_lib/ebb'
-    server = Ebb::start_server(app, :port => @port)
-  end
-
-  
-  def start_mongrel
-   require 'mongrel'
-   ENV.delete('EVENT')
-   Rack::Handler::Mongrel.run(app, :Port => @port)
-  end
-  
-  def start_thin
-    require 'thin'
-    Rack::Handler::Thin.run(app, :Port => @port)
-  end
-  
-  def start_fcgi
-    Rack::Handler::FastCGI.run(app, :Port => @port)
-  end
-  
-  def trial(ab_cmd)
-    cmd = ab_cmd.sub('PORT', @port.to_s)
-    
-    puts "#{@name} (#{cmd})"
-    
-    r = %x{#{cmd}}
-    
-    return nil unless r =~ /Requests per second:\s*(\d+\.\d\d)/
-    rps = $1.to_f
-    if r =~ /Time taken for tests:\s*(\d+\.\d+) seconds/
-      time_taken = $1.to_f
-    end
-    if r =~ /Complete requests:\s*(\d+)/
-      requests_completed = $1.to_i
-    end
-    if r =~ /Failed requests:\s*(\d+)/     
-      failed_requests =  $1.to_i
-    else
-      raise "didn't get how many failed requests from ab"
-    end
-    successful_requests = requests_completed - failed_requests
-    puts "  #{rps} req/sec (#{requests_completed} total, #{failed_requests} failed in #{"%.2f" % time_taken} seconds)"
-    
-    {
-      :server => @name,
-      :rps => rps,
-      :time_taken => time_taken,
-      :requests_completed => requests_completed,
-      :requests_failed => failed_requests,
-      :ab_cmd => cmd
-    }
-  end
-end