evdispatch 0.2.4 → 0.2.5

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

@@ -162,26 +162,26 @@ void Dispatch::stop()
   printf( "EVD::Dispatch stopping...\n" );
   m_lock.lock();
   m_loop_started = false;
+  m_lock.unlock();
+
   m_cond.broadcast();
   m_requests.signal();
   m_responses.signal();
-  m_lock.unlock();
 
   // send the message to unloop all
-  { 
+  /*{ 
     Guard g(m_lock);
     do {
       // unloop again
-      printf( "main loop is waiting on the event loop to go down\n" );
-      ev_unloop( m_loop, EVUNLOOP_ALL );
-      if( m_loop_down ) { break; }
-      ev_unref( m_loop ); // decrement the ref count
+      printf( "main loop is waiting on the event loop to go down: %d\n", ev_loop_count( m_loop ) );
+
       // sleep until the event loop tells us it's done
-      m_cond.timed_wait(m_lock,Timer(1,0)); // wait until we're done
+      m_cond.timed_wait(m_lock,Timer(2,0)); // wait until we're done
     }while( !m_loop_down );
-  }
+  }*/
+  ev_async_send( m_loop, &m_loop_ender ); // signal to the event loop it's time to stop
 
-  printf( "okay, we're joining the thread\n" );
+  //printf( "okay, we're joining the thread\n" );
   pthread_join( m_tid, NULL );
   if( m_http_client ) {
     delete m_http_client;
@@ -247,6 +247,15 @@ void Dispatch::request_cb( struct ev_loop *loop, struct ev_async *w, int revents
 
 }
 
+void Dispatch::shutdown_loop_cb( struct ev_loop *loop, struct ev_async *w, int revents )
+{
+//  printf( "received the loop unref message\n" );
+  Dispatch *d = (Dispatch*)w->data;
+  ev_async_stop( d->m_loop, &(d->m_request_watcher) );
+  ev_async_stop( d->m_loop, &(d->m_loop_ender) );
+  ev_unloop( d->m_loop, EVUNLOOP_ALL );
+}
+
 // the main event loop
 void Dispatch::event_loop_main()
 {
@@ -256,20 +265,29 @@ void Dispatch::event_loop_main()
   ev_async_init( &m_request_watcher, request_cb_start );
   ev_async_start( m_loop, &m_request_watcher );
 
+  m_loop_ender.data = this;
+  ev_async_init( &m_loop_ender, shutdown_loop_cb );
+  ev_async_start( m_loop, &m_loop_ender );
+  ev_unref( m_loop ); // don't include the ender in the ev_loop life count
+
   m_lock.lock();
   m_loop_started = true;
   m_loop_down = false;
   m_cond.signal(); // let the world know we're ready for them
   m_lock.unlock();
 
+//  printf( "loop running\n" );
   // start the main event loop
   ev_loop( m_loop, 0 );
-  ev_async_stop( m_loop, &m_request_watcher );
+//  printf( "ev loop is done\n" );
+
+  // the shutdown sequence
   m_http_client->stop();
   ev_loop_destroy( m_loop );
 
+//  printf( "get the lock to shutdown\n" );
   m_lock.lock();
-  printf( "let the world know the event loop is going down\n" );
+//  printf( "let the world know the event loop is going down\n" );
   m_loop_down = true;
   m_cond.signal(); // let the world know we're done
   m_lock.unlock();

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

@@ -247,6 +247,7 @@ namespace EVD {
     
     static void request_cb_start( struct ev_loop *loop, struct ev_async *w, int revents );
     void request_cb( struct ev_loop *loop, struct ev_async *w, int revents );
+    static void shutdown_loop_cb( struct ev_loop *loop, struct ev_async *w, int revents );
 
     bool store_response_for( request_t id );
 
@@ -257,7 +258,7 @@ namespace EVD {
     // this triggers a callback once every N milliseconds
     struct ev_timer m_clock;
 
-    struct ev_async m_request_watcher;
+    struct ev_async m_request_watcher, m_loop_ender;
 
     pid_t m_pid;
     pthread_t m_tid;

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

@@ -20,28 +20,28 @@ static void multi_error_report(CURLMcode rc)
 {
   switch(rc) {
   case CURLM_CALL_MULTI_PERFORM:
-    printf("curlm:perform\n");
+    printf("curlm:perform: %s\n", curl_multi_strerror(rc) );
     break;
   case CURLM_OK:
 //    printf("curlm:ok\n");
     break;
   case CURLM_BAD_HANDLE:
-    printf("curlm:bad handle\n");
+    printf("curlm:bad handle: %s\n", curl_multi_strerror(rc) );
     break;
   case CURLM_BAD_EASY_HANDLE:
-    printf("curlm:bad easy handle\n");
+    printf("curlm:bad easy handle: %s\n", curl_multi_strerror(rc) );
     break;
   case CURLM_OUT_OF_MEMORY:
-    printf("curlm:oh shit out of memory\n");
+    printf("curlm:oh shit out of memory: %s\n", curl_multi_strerror(rc) );
     break;
   case CURLM_INTERNAL_ERROR:
-    printf("curlm:oh shit internal error\n");
+    printf("curlm:oh shit internal error: %s\n", curl_multi_strerror(rc) );
     break;
   case CURLM_BAD_SOCKET:
-    printf("curlm:bad socket\n");
+    printf("curlm:bad socket: %s\n", curl_multi_strerror(rc) );
     break;
   case CURLM_UNKNOWN_OPTION:
-    printf("curlm:unknown option\n");
+    printf("curlm:unknown option: %s\n", curl_multi_strerror(rc) );
     break;
   }
 }
@@ -103,7 +103,7 @@ int HttpClient::sock_cb(CURL *e, curl_socket_t sock, int action, void *cbp, void
   switch( action ){
   case CURL_POLL_REMOVE: // (4) unregister
     // make sure we clear it out
-//    printf( " del sock: 0x%X\n", sockinfo );
+    //printf( " del sock: 0x%X\n", sockinfo );
     curl_multi_assign(client->m_handle, sock, NULL);
     sockinfo->finish();
     delete sockinfo;
@@ -161,9 +161,11 @@ int HttpClient::update_timeout_cb(CURLM *multi, long timeout_ms, void *userp)
     ev_timer_start( client->m_disp->get_loop(), &(client->m_timer) );
   }
   else {
+    //printf( "start up http client timer\n" );
     ev_timer_init( &(client->m_timer), timeout_cb, timeout, timeout );
     client->m_timer.data = client;
     ev_timer_start( client->m_disp->get_loop(), &(client->m_timer) );
+    client->m_timer_set = true;
   }
 
   return 0;
@@ -221,6 +223,14 @@ void HttpClient::check_handles()
     }
 
   } while( easy );
+
+  if( msgs_left == 0 && m_timer_set ) {
+    // stop the event timer
+    //printf( "stop http client timer, no pending requests\n" );
+    ev_timer_stop( m_disp->get_loop(), &m_timer );
+    m_timer_set = false;
+  }
+
 }
 
 // CURLOPT_WRITEFUNCTION
@@ -307,7 +317,8 @@ bool HttpRequest::enable()
       rc = curl_multi_socket_all( m_client->m_handle, &m_client->m_active );
     } while( rc == CURLM_CALL_MULTI_PERFORM && m_client );
   }
-
+  // XXX: it's really strange that m_client could be 0x0 all of a sudden here... but that's currently what must be happening
+  // in order for the final return code to be CURLM_CALL_MULTI_PERFORM.
   if( m_client ) { 
     m_client->check_handles();
   }

data/lib/evdispatch/version.rb

@@ -2,7 +2,7 @@ module Evdispatch #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 4
+    TINY  = 5
 
     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.2</a>
+      <a href="http://rubyforge.org/projects/evdispatch" class="numbers">0.2.4</a>
     </div>
     <h4 style="float:right;padding-right:10px;">&#x2192; &#8216;evdispatch&#8217;</h4>
 
@@ -84,6 +84,10 @@ by the time it gets finished with the blogs. This is because the background thre
 One thing to keep in mind is the background thread will block if it has to resolve <span class="caps">DNS</span> names.</p>
 
 
+	<p>In my testing I&#8217;ve successfully run 3 million requests.  Doing 10000 iterations of 300 concurrent requests, on a Linux <span class="caps">FC7</span> duel P4 machine.
+Memory utilization stays flat at around 14 to 19 megs with about 2,000 &#8211; 12,000 objects.</p>
+
+
 	<h2>Demonstration of usage</h2>
 
 
@@ -130,10 +134,15 @@ One thing to keep in mind is the background thread will block if it has to resol
 
 
 <ul>
-<li><h5> I get an error when installing the gem: <strong>&#8220;error: &#8216;curl_socket_t&#8217; has not been
-  declared&#8221;</strong></h5>
-  <p> You need to have at least version 7.16 of <a href="http://curl.haxx.se/download.html">libcurl</a>.  I recommend at least version: 7.18.1.</p>
-</li>
+  <li><h5>I get an error when installing the gem: <strong>&#8220;error: &#8216;curl_socket_t&#8217; has not been
+    declared&#8221;</strong></h5>
+    <p> You need to have at least version 7.17.1 of <a href="http://curl.haxx.se/download.html">libcurl</a>.  I recommend at least version: 7.18.1.</p>
+  </li>
+  <li><h5>Mac <span class="caps">OSX</span> (Darwin) Crashing on <span class="caps">HTTP POST</span> request</h5>
+    <p>There are some issues with crashes on darwin builds when making an <span class="caps">HTTP</span>
+    <span class="caps">POST</span>.  This doesn&#8217;t happen on Linux and I&#8217;m actively looking into the
+    issue on my apple.</p>
+  </li>
 </ul>
 
 	<h2>License</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evdispatch
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Todd A. Fisher