evdispatch 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.2 2008-04-14
+  * Make options optional in request method
+  * Improve timeouts
+  * Add flush method, to flush out any buffered responses
+
 == 0.2 2008-04-13
   * Add HTTP headers to response 
   * Expose some basic libcurl options (useragent, cookie, followlocation,  etc.. see libdispatch Changelog for details

data/Manifest.txt

@@ -29,6 +29,7 @@ website/stylesheets/screen.css
 website/template.html.erb
 ext/revdispatch/server.rb
 ext/revdispatch/test.rb
+ext/revdispatch/stest.rb
 ext/revdispatch/extconf.rb
 ext/revdispatch/revdispatch.cc
 ext/revdispatch/libdispatch-0.1/

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

@@ -100,6 +100,18 @@ bool Dispatch::start()
   return (count < 100);
 }
 
+void Dispatch::flush()
+{
+  // lock the responses
+  m_responses.m_lock.lock();
+  while( !m_responses.m_queue.empty() ){
+    m_responses.m_queue.pop();
+  }
+  // empty out the thread local buffer
+  m_responded.clear();
+  m_responses.m_lock.unlock();
+}
+
 // tell the background event listener to terminate
 void Dispatch::stop()
 {
@@ -245,10 +257,12 @@ Queue<Response>::POP_STATE Dispatch::wait_for_response_by_id( request_t id, Time
 
   if( loc != m_responded.end() ){ return Queue<Response>::POPPED; }
 
+  timeout.update();
   while( (rep = m_responses.pop_or_wait( &rstate, m_loop_started, timeout )) ) {
     //printf( "rep: %s, id: %d\n", rep->name.c_str(), rep->id );
     m_responded[rep->id] = rep;
     if( rep->id == id ){ return rstate; }
+    timeout.update();
   }
 
   return rstate;
@@ -259,6 +273,7 @@ Response *Dispatch::get_next_response( Timer timer )
   Response *rep = NULL;
   Queue<Response>::POP_STATE  rstate;
 
+  timer.update();
   do {
     rep = m_responses.pop_or_wait( &rstate, m_loop_started, timer );
     if( rstate == Queue<Response>::EXITING ){ rep = NULL; break; }
@@ -276,6 +291,7 @@ Response *Dispatch::get_next_response( Timer timer )
     else if( rep ) {
       --m_pending;
     }
+    timer.update();
 
   } while( !rep && rstate == Queue<Response>::EXPIRED );
 

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

@@ -17,14 +17,22 @@ namespace EVD {
   typedef unsigned long request_t;
 
   struct Timer {
-    Timer( long int seconds, long int nanoseconds ) {
+
+    Timer( long int seconds, long int nanoseconds ) : m_seconds( seconds ), m_nanoseconds( nanoseconds ) { update(); }
+
+    // offset the timer from now
+    void update() {
       struct timeval now;
       current_time( &now );
-      m_time.tv_sec = now.tv_sec + seconds;
-      m_time.tv_nsec = (now.tv_usec * 1000) + nanoseconds;
+      m_time.tv_sec = now.tv_sec + m_seconds;
+      m_time.tv_nsec = (now.tv_usec*1000) + m_nanoseconds;
+      //printf( "seconds: %ld, nanoseconds: %ld, from s: %ld, ns: %ld, based s: %ld, us: %ld\n", m_time.tv_sec, m_time.tv_nsec, m_seconds, m_nanoseconds, now.tv_sec, now.tv_usec );
     }
+
     inline static int current_time( struct timeval *now) { return gettimeofday(now, NULL); }
     static double elapsed_time( struct timeval *then );
+    int long m_seconds;
+    int long m_nanoseconds;
     struct timespec m_time;
   };
 
@@ -146,6 +154,7 @@ namespace EVD {
         req = m_queue.front();
       }
       while( !req ) {
+        timer.update();
         m_cond.timed_wait( m_lock, timer );
         if( !cond ){ *rstate = EXITING; break; }
         size = m_queue.size();
@@ -224,6 +233,9 @@ namespace EVD {
     // tell the background event listener to terminate
     void stop();
 
+    // empty the response local buffer and queue
+    void flush();
+
     request_t request( Request *req );
 
     // from the main thread, get the next available response

data/ext/revdispatch/libdispatch-0.1/test/next_test.cc

@@ -32,7 +32,10 @@ static void run_tests( Dispatch &dispatcher, int count )
   Response *rep = NULL;
   double longest_request = 0.0;
 
-  while( expected_response_count > 0 && (rep = dispatcher.get_next_response(Timer(1,0))) ){
+  // timer issues
+  Timer timeout(1,(500*1000*1000));
+
+  while( expected_response_count > 0 && (rep = dispatcher.get_next_response(timeout)) ){
     if( longest_request < rep->response_time ){
       longest_request = rep->response_time;
     }

data/ext/revdispatch/libdispatch-0.1/test/pipe_test.cc

@@ -41,32 +41,27 @@ static void run_tests( Dispatch &dispatcher, int count )
   FD_ZERO(&wr);
   FD_ZERO(&er);
   FD_SET(pfd[0], &rd);
-  tv.tv_sec = 0;
+  tv.tv_sec = 1;
   tv.tv_usec = 0;
 
-  try {
-    while( (retval = select( pfd[0]+1, &rd, &wr, &er, NULL )) ) {
-      if( retval == -1 && errno == EINTR ) { continue; }
-      if( retval < 0 ){ perror("select"); break; }
-      if( FD_ISSET(pfd[0],&rd) ){
-        retval = read(pfd[0],READ_BUFFER,read_size);
-        if( retval >= 0 ) {
-          result_buffer.append(READ_BUFFER,retval);
-          if( retval == 0 ){ break; }
-        }
-        else {
-          perror("read");
-          break;
-        }
+  while( (retval = select( pfd[0]+1, &rd, &wr, &er, &tv )) ) {
+    if( retval == -1 && errno == EINTR ) { continue; }
+    if( retval < 0 ){ perror("select"); break; }
+    if( FD_ISSET(pfd[0],&rd) ){
+      retval = read(pfd[0],READ_BUFFER,read_size);
+      if( retval >= 0 ) {
+        result_buffer.append(READ_BUFFER,retval);
+        if( retval == 0 ){ break; }
+      }
+      else {
+        perror("read");
+        break;
       }
     }
-    fprintf( stderr, "loop returnd\n" );
-    printf("response: %s, in %.5lf seconds of Content-Length: %d bytes\n%s", res->name.c_str(), res->response_time, result_buffer.length(), res->m_header.c_str() );
-    delete res;
-  }catch(const std::exception &exp){
-    perror("select");
   }
   fprintf( stderr, "loop returnd\n" );
+  printf("response: %s, in %.5lf seconds of Content-Length: %d bytes\n%s", res->name.c_str(), res->response_time, result_buffer.length(), res->m_header.c_str() );
+  delete res;
 }
 
 int main(int argc, char **argv)

data/ext/revdispatch/revdispatch.cc

@@ -91,13 +91,19 @@ VALUE Loop_request_http( VALUE self, VALUE url )
 }
 
 static
-VALUE Loop_request( VALUE self, VALUE url, VALUE options )
+VALUE Loop_request( int argc, VALUE *argv, VALUE self )
 {
   EVD::Dispatch *d;
   const int VALUE_BUFFER_SIZE = 1024;
   char VALUE_BUFFER[VALUE_BUFFER_SIZE];
   Data_Get_Struct( self, EVD::Dispatch, d );
 
+  VALUE url, options;
+
+  // required 1 argument the 'url' and  1 optional the hash of options
+  if( rb_scan_args( argc, argv, "11", &url, &options ) == 1 ) {
+    options = rb_hash_new();
+  }
 
   EVD::HttpRequest *req = new EVD::HttpRequest( *d, RSTRING_PTR(url) );
 
@@ -122,7 +128,7 @@ VALUE Loop_wait_for_response( VALUE self, VALUE id, VALUE timeout_seconds, VALUE
 
   Data_Get_Struct( self, EVD::Dispatch, d );
 
-  rstate = d->wait_for_response_by_id( rid, EVD::Timer(FIX2LONG(timeout_seconds), FIX2LONG(timeout_mseconds)) );
+  rstate = d->wait_for_response_by_id( rid, EVD::Timer(FIX2LONG(timeout_seconds), (FIX2LONG(timeout_mseconds)*1000*1000)) );
 
   return rb_int_new(rstate);
 }
@@ -137,7 +143,7 @@ VALUE Loop_response_for( VALUE self, VALUE id )
   EVD::request_t rid = FIX2LONG(id);
 
   res = (EVD::HttpResponse*)d->response_for( rid );
-  if( res ){
+  if( res ) {
 
     VALUE result = rb_hash_new();
 
@@ -154,6 +160,16 @@ VALUE Loop_response_for( VALUE self, VALUE id )
   return Qnil;
 }
 
+static 
+VALUE Loop_flush( VALUE self )
+{
+  EVD::Dispatch *d;
+  Data_Get_Struct( self, EVD::Dispatch, d );
+
+  d->flush();
+  return Qnil;
+}
+
 static 
 VALUE Loop_stop( VALUE self )
 {
@@ -191,7 +207,8 @@ extern "C" void Init_revdispatch()
   
   rb_define_method( rb_Loop, "start", (VALUE (*)(...))Loop_start, 0 );
   rb_define_method( rb_Loop, "request_http", (VALUE (*)(...))Loop_request_http, 1 );
-  rb_define_method( rb_Loop, "request", (VALUE (*)(...))Loop_request, 2 );
+  rb_define_method( rb_Loop, "request", (VALUE (*)(...))Loop_request, -1 );
+  rb_define_method( rb_Loop, "flush", (VALUE (*)(...))Loop_flush, 0 );
   rb_define_method( rb_Loop, "response_for", (VALUE (*)(...))Loop_response_for, 1 );
   rb_define_method( rb_Loop, "wait_for_response", (VALUE (*)(...))Loop_wait_for_response, 3 );
   rb_define_method( rb_Loop, "stop", (VALUE (*)(...))Loop_stop, 0 );

data/ext/revdispatch/stest.rb

@@ -0,0 +1,44 @@
+$:.unshift File.join(File.dirname(__FILE__),'..','..','lib')
+
+require 'evdispatch'
+require 'test/unit'
+
+$d = Evdispatch::Loop.new
+# start the event loop thread
+$d.start
+
+class TestRequests < Test::Unit::TestCase
+
+  def test_response
+    id = $d.request_http("http://127.0.0.1:4044/bytes/10")
+    response = $d.response( id )
+    #puts response.inspect
+    #{:response_time=>0.003444, :name=>"http://127.0.0.1:4044/bytes/10", :id=>0, :body=>"CCCCCCCCCC"}
+    assert_equal("http://127.0.0.1:4044/bytes/10", response[:name])
+    assert_equal("CCCCCCCCCC", response[:body])
+    assert_equal("HTTP/1.1 200 OK\r\nContent-Type: text/json\r\nContent-Length: 10\r\nConnection: close\r\n\r\n", response[:header])
+    assert(response.keys.include?(:response_time))
+    assert(response.keys.include?(:id))
+  end
+
+  def test_options_request
+    id = $d.request("http://127.0.0.1:4044/redir/1", :followlocation => 1, :referer => 'pizza')
+    response = $d.response( id )
+    assert_match(/ 302 Moved Temporarily/,response[:header])
+    assert_match(/ 200 OK/,response[:header])
+  end
+
+  def test_delayed_with_flush
+    id = $d.request("http://127.0.0.1:4044/delay/0")
+    tid = $d.request("http://127.0.0.1:4044/delay/3")
+    res = $d.response( id, 1.0, 1 )
+    res2 = $d.response( tid, 1.0, 1 )
+    if !res or !res2
+      $d.flush # flush because we aborted before we finished, still the issue of the request is still running, but any previous responses that were delayed will be flushed
+    end
+    puts res.inspect
+    puts res2.inspect
+  end
+end
+
+# not bothering to cleanup

data/ext/revdispatch/test.rb

@@ -62,8 +62,8 @@ def run_trial
 
   ebbbase = "http://127.0.0.1:4044/"
   timer = Time.now
-  ids = request_bytes_from( d, ebbbase, 100, 1000 )
-  ids += request_delay_from( d, ebbbase, 100, 1 )
+  ids = request_bytes_from( d, ebbbase, 400, 10000 )
+  #ids += request_delay_from( d, ebbbase, 100, 1 )
 
   # wait for each response
   puts "expecting #{ids.size} responses..."

data/lib/evdispatch/loop.rb

@@ -4,11 +4,21 @@ require 'revdispatch'
 # ruby threads can execute while we waiting for a response
 module Evdispatch
   class Loop
-    def response(id)
-      while wait_for_response( id, 1, 0 )
+    def response(id, timeout = 1.0, max_attempts = 100)
+      attempts = 0
+      ms = timeout * 1000 # convert to miliseconds
+      ms_i = ms.to_i
+      seconds = ms_i / 1000
+      mseconds = (ms - (seconds*1000)).to_i
+      #puts "Waiting #{seconds} seconds and #{mseconds} miliseconds"
+
+      while (wait_for_response( id, seconds, mseconds ) and attempts < max_attempts )
         res = response_for( id )
         break if res
+        attempts += 1
+        #puts "Attempt: #{attempts}"
       end
+      return nil if !res and attempts == max_attempts 
       res = response_for( id ) unless res
       res
     end

data/lib/evdispatch/version.rb

@@ -2,7 +2,7 @@ module Evdispatch #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   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.2.0</a>
+      <a href="http://rubyforge.org/projects/evdispatch" class="numbers">0.2.1</a>
     </div>
     <h4 style="float:right;padding-right:10px;">&#x2192; &#8216;evdispatch&#8217;</h4>
 
@@ -56,9 +56,9 @@ web applications to make multiple concurrent service requests to satisify a sing
 
   <span class="keyword">class </span><span class="class">DashController</span> <span class="punct">&lt;</span> <span class="constant">ApplicationController</span>
     <span class="keyword">def </span><span class="method">index</span>
-      <span class="attribute">@blogs_id</span> <span class="punct">=</span> <span class="global">$dispatcher</span><span class="punct">.</span><span class="ident">request_http</span><span class="punct">(&quot;</span><span class="string">http://10.0.6.45/service/blogs</span><span class="punct">&quot;)</span>
-      <span class="attribute">@news_id</span> <span class="punct">=</span> <span class="global">$dispatcher</span><span class="punct">.</span><span class="ident">request_http</span><span class="punct">(&quot;</span><span class="string">http://10.0.6.45/service/news</span><span class="punct">&quot;)</span>
-      <span class="attribute">@messages_id</span> <span class="punct">=</span> <span class="global">$dispatcher</span><span class="punct">.</span><span class="ident">request_http</span><span class="punct">(&quot;</span><span class="string">http://10.0.6.45/service/messages</span><span class="punct">&quot;)</span>
+      <span class="attribute">@blogs_id</span> <span class="punct">=</span> <span class="global">$dispatcher</span><span class="punct">.</span><span class="ident">request</span><span class="punct">(&quot;</span><span class="string">http://10.0.6.45/service/blogs</span><span class="punct">&quot;)</span>
+      <span class="attribute">@news_id</span> <span class="punct">=</span> <span class="global">$dispatcher</span><span class="punct">.</span><span class="ident">request</span><span class="punct">(&quot;</span><span class="string">http://10.0.6.45/service/news</span><span class="punct">&quot;)</span>
+      <span class="attribute">@messages_id</span> <span class="punct">=</span> <span class="global">$dispatcher</span><span class="punct">.</span><span class="ident">request</span><span class="punct">(&quot;</span><span class="string">http://10.0.6.45/service/messages</span><span class="punct">&quot;)</span>
     <span class="keyword">end</span>
   <span class="keyword">end</span>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evdispatch
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Todd A. Fisher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-13 00:00:00 -04:00
+date: 2008-04-14 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -58,6 +58,7 @@ files:
 - website/template.html.erb
 - ext/revdispatch/server.rb
 - ext/revdispatch/test.rb
+- ext/revdispatch/stest.rb
 - ext/revdispatch/extconf.rb
 - ext/revdispatch/revdispatch.cc
 - ext/revdispatch/libdispatch-0.1/