evdispatch 0.4.1 → 0.4.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.4.2 2008-05-17
+  * Prefetch from response Queue to reduce locking overhead
+  * Improve tests to auto run a daemonized test server
+
 == 0.4.1 2008-05-04
   * Avoid deleting request before it finishes enabling
   * Protect config.h with HAVE_CONFIG_H macro

data/ext/revdispatch/libdispatch/src/ev_dispatch.cc

@@ -330,23 +330,34 @@ Response *Dispatch::response_for( request_t id )
   return res;
 }
 
+// expects lock on m_responses queue to be acquired
+void Dispatch::pop_responses_into_response_table()
+{
+  Response *res = NULL;
+  while( !m_responses.m_queue.empty() ) {
+    res = m_responses.m_queue.front();
+    m_responses.m_queue.pop();
+    m_responded[res->id] = res;
+  }
+}
+
 Queue<Response>::POP_STATE Dispatch::wait_for_response_by_id( request_t id, Timer timeout )
 {
   // first check if the response is loaded 
   Response *res = NULL;
   Queue<Response>::POP_STATE rstate;
-  RespondedTable::iterator loc = m_responded.find(id);
 
+
+  // check in the local memory table
+  RespondedTable::iterator loc = m_responded.find(id);
   if( loc != m_responded.end() ){ return Queue<Response>::POPPED; }
 
-  m_responses.m_lock.lock();
+  Guard lock(m_responses.m_lock);
 
   // see if we can get the response back
   std::queue<Response*>::size_type size = m_responses.m_queue.size();
   if( size > 0 ) {
-    res = m_responses.m_queue.front();
-    m_responses.m_queue.pop();
-    m_responded[res->id] = res;
+    this->pop_responses_into_response_table();
     rstate = Queue<Response>::POPPED;
   }
   else {
@@ -354,9 +365,7 @@ Queue<Response>::POP_STATE Dispatch::wait_for_response_by_id( request_t id, Time
     timeout.update();
     m_responses.m_cond.timed_wait( m_responses.m_lock, timeout );
     if( size > 0 ) {
-      res = m_responses.m_queue.front();
-      m_responses.m_queue.pop();
-      m_responded[res->id] = res;
+      this->pop_responses_into_response_table();
       rstate = Queue<Response>::POPPED;
     }
     else {
@@ -364,7 +373,6 @@ Queue<Response>::POP_STATE Dispatch::wait_for_response_by_id( request_t id, Time
       res = NULL;
     }
   }
-  m_responses.m_lock.unlock();
 
   return rstate;
 }

data/ext/revdispatch/libdispatch/src/ev_dispatch.h

@@ -259,6 +259,8 @@ namespace EVD {
 
   protected:
 
+    void pop_responses_into_response_table();
+
     struct ev_loop *m_loop;
 
     // this triggers a callback once every N milliseconds

data/ext/revdispatch/server.rb

@@ -6,16 +6,23 @@ TEST_PORT = 4044
 $req_count = 0
 
 class TestApp
-
+  
   def initialize
-    puts "Test server '#{__FILE__}', started"
+    instance_eval do
+      if $daemonized
+        def log(msg) ; end
+      else
+        def log(msg) ; puts msg ; end
+      end
+    end
+    log "Test server '#{__FILE__}', started"
   end
 
   def call(env)
     commands = env['PATH_INFO'].split('/')
     extras = {}
     $req_count += 1
-    puts "#{$req_count} requests"
+    log "#{$req_count} requests"
 
     if commands.include?('delay')
       n = commands.last.to_f
@@ -38,7 +45,7 @@ class TestApp
         extras = {'Location' => "/redir/#{n-1}"}
         body = "redirect to redir #{n-1}"
       end
-      puts body
+      log body
       status = 302
     elsif commands.include?('test_post_length')
       input_body = env['rack.input'].read
@@ -61,10 +68,17 @@ class TestApp
     [status, {'Content-Type' => 'text/json'}.merge(extras), body]
   end
 end
-# ebb's much better at handling concurrent requests use it if it's installed
-begin
-  require 'ebb'
-  Ebb.start_server(TestApp.new, :port => TEST_PORT)
-rescue LoadError => e
-  Rack::Handler::Mongrel.run(TestApp.new, :Port => TEST_PORT )
+if $0 == __FILE__
+  # ebb's much better at handling concurrent requests use it if it's installed
+  begin
+    require 'ebb'
+    if ARGV[0] == '-d'
+      require 'daemons'
+      $daemonized = true
+      Daemons.daemonize
+    end
+    Ebb.start_server(TestApp.new, :port => TEST_PORT)
+  rescue LoadError => e
+    Rack::Handler::Mongrel.run(TestApp.new, :Port => TEST_PORT )
+  end
 end

data/lib/evdispatch/version.rb

@@ -2,7 +2,7 @@ module Evdispatch #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_evdispatch.rb

@@ -1,6 +1,9 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestEvdispatch < Test::Unit::TestCase
+  def setup
+    TestServer.setup
+  end
 
   def test_streaming
     d = Evdispatch::Loop.new

data/test/test_helper.rb

@@ -4,3 +4,29 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..','ext','revdis
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..','lib'))
 
 require 'evdispatch'
+
+class TestServer
+  def self.setup
+    if !defined?($server_task)
+      require 'rubygems'
+      require 'daemons'
+
+      # start up the test server
+      require File.expand_path(File.join(File.dirname(__FILE__), '..','ext','revdispatch','server'))
+      $server_task = Daemons.call do
+        $daemonized = true
+        begin
+          require 'ebb'
+          Ebb.start_server(TestApp.new, :port => TEST_PORT)
+        rescue LoadError => e
+          Rack::Handler::Mongrel.run(TestApp.new, :Port => TEST_PORT )
+        end
+      end
+      sleep(0.5) # wait for the server to start up
+
+      at_exit {
+        $server_task.stop
+      }
+    end
+  end
+end

data/website/index.html

@@ -18,7 +18,7 @@
     <h1>evdispatch</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/evdispatch"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/evdispatch" class="numbers">0.4.1</a>
+      <a href="http://rubyforge.org/projects/evdispatch" class="numbers">0.4.2</a>
     </div>
     <h4 style="float:right;padding-right:10px;">&#x2192; &#8216;evdispatch&#8217;</h4>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evdispatch
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Todd A. Fisher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-15 00:00:00 -04:00
+date: 2008-05-17 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: evdispatch
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Based on libev provides a background event loop for making simulataneous requests