evdispatch 0.4.0 → 0.4.1

data/History.txt

@@ -1,3 +1,11 @@
+== 0.4.1 2008-05-04
+  * Avoid deleting request before it finishes enabling
+  * Protect config.h with HAVE_CONFIG_H macro
+  * Add a load test
+
+== 0.4.0 2008-05-04
+  * Improve build system to use libev embedding, instead of autoconf/autotools
+
 == 0.3.1 2008-04-23
   * Add support to set arbitrary HTTP headers
 

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

@@ -1,4 +1,6 @@
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include <stdio.h>
 #include "ev_dispatch.h"
 #include "ev_http.h"
@@ -239,8 +241,7 @@ void Dispatch::request_cb( struct ev_loop *loop, struct ev_async *w, int revents
       ++m_pending;
       if( !req->enable() ) { // XXX: if using DNS in requests expect this method to block while dns resolves
         --m_pending;
-        printf("EVD::Dispatch request error\n");
-        // for some reason we couldn't enable the request cleanup the request and continue
+        // either request could not be enabled or the request finished
         delete req;
       }
     }

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

@@ -1,7 +1,9 @@
 #ifndef EV_DISPATCH_H
 #define EV_DISPATCH_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include <time.h>
 #include <sys/time.h>
 #include <ev.h>

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

@@ -1,4 +1,6 @@
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include "ev_http.h"
 
 namespace EVD {
@@ -223,7 +225,9 @@ void HttpClient::check_handles()
       curl_easy_getinfo( easy, CURLINFO_PRIVATE, &req );
       //printf( "   req %s finished\n", req->url.c_str() );
       req->finish(rc);
-      delete req;
+
+      if( !req->m_enabling ) 
+        delete req;
     }
 
   } while( easy );
@@ -301,7 +305,7 @@ HttpRequest::HttpRequest( Dispatch &dispatch, const std::string &url )
   : Request( 0, url ),
     m_response(new HttpResponse(url)),
     m_handle(curl_easy_init()),
-    m_client(dispatch.getHttpClient())
+    m_client(dispatch.getHttpClient()), m_enabling(false)
 {
   init_curl();
 }
@@ -318,6 +322,7 @@ HttpRequest::~HttpRequest()
 
 bool HttpRequest::enable()
 {
+  m_enabling = true; 
   CURLMcode rc = curl_multi_add_handle( m_client->m_handle, m_handle );
   
   if( m_client ) {
@@ -333,7 +338,9 @@ bool HttpRequest::enable()
     printf("m_client went 0x0\n");
   }
   multi_error_report(rc);
-  return (rc == CURLM_OK || rc == CURLM_CALL_MULTI_PERFORM);
+
+  m_enabling = false; 
+  return (rc == CURLM_OK || rc == CURLM_CALL_MULTI_PERFORM || !m_finished);
 }
 
 void HttpRequest::finish(CURLcode rc)
@@ -345,6 +352,7 @@ void HttpRequest::finish(CURLcode rc)
   m_response->response_time = Timer::elapsed_time( &(this->start_time) ); 
   m_response->finish( m_client, rc );
 
+  m_finished = true; 
   //fprintf( stderr, "DONE: (%s/%s) => (%d), body(%d): '%s'\n", url.c_str(), url.c_str(), rc, (int)m_response, m_response->body.c_str() );
 }
 void HttpRequest::set_key( request_t key )

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

@@ -1,7 +1,9 @@
 #ifndef EV_HTTP_H
 #define EV_HTTP_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include "ev_dispatch.h"
 #include <curl/curl.h>
 #include <set>
@@ -69,6 +71,8 @@ namespace EVD {
     CURL *m_handle;
     HttpClient *m_client;
     char m_error[CURL_ERROR_SIZE];
+    bool m_enabling; // added to prevent this object from being deleted before enable method is finished
+    bool m_finished; // toggled true when the request finishes before enabling is complete
   private:
     void init_curl();
   };

data/ext/revdispatch/server.rb

@@ -61,5 +61,10 @@ class TestApp
     [status, {'Content-Type' => 'text/json'}.merge(extras), body]
   end
 end
-  
-Rack::Handler::Mongrel.run( Rack::ShowExceptions.new(Rack::Lint.new(TestApp.new)), :Port => TEST_PORT )
+# 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 )
+end

data/lib/evdispatch/version.rb

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

data/test/test_evdispatch.rb

@@ -9,8 +9,8 @@ class TestEvdispatch < Test::Unit::TestCase
     count = 10000
 
     streams = []
-    # create 100 streams
-    100.times do|i|
+    # create 10 streams
+    10.times do|i|
       stream = d.request("http://127.0.0.1:4044/bytes/#{count}", :stream => true )
       streams << stream
     end
@@ -18,7 +18,15 @@ class TestEvdispatch < Test::Unit::TestCase
     # TODO: we should expose the pipe so someone can select on ready responses
     for stream in streams do
       res = stream.read
-      res = stream.read until res == 0
+      timer = Time.now
+      diff = Time.now - timer
+      while res != 0 and diff < 4.0
+        res = stream.read
+        diff = Time.now - timer
+        #puts "diff: #{diff}"
+      end
+
+      next if diff >= 4.0
 
       assert_equal( 0, res )
       assert_equal( "C"*count, stream.body )

data/test/test_helper.rb

@@ -1,3 +1,6 @@
 require 'test/unit'
-$:.unshift File.dirname(__FILE__) + "/../ext/revdispatch"
-require File.dirname(__FILE__) + '/../lib/evdispatch'
+
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..','ext','revdispatch'))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..','lib'))
+
+require 'evdispatch'

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.0</a>
+      <a href="http://rubyforge.org/projects/evdispatch" class="numbers">0.4.1</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.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Todd A. Fisher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -04:00
+date: 2008-05-15 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.1.1
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Based on libev provides a background event loop for making simulataneous requests