evdispatch 0.1.3 → 0.1.4

data/History.txt

@@ -1,3 +1,6 @@
+== 0.1.4 2008-04-11
+* Fix another issue with building this time on ppc it needs ranlib executed
+
 == 0.1.2 2008-04-11
 * Fix issues with building dependent library on darwin
 

data/Manifest.txt

@@ -79,7 +79,6 @@ ext/revdispatch/libdispatch-0.1/libev-3.2/configure.ac
 ext/revdispatch/libdispatch-0.1/libev-3.2/ev.3
 ext/revdispatch/libdispatch-0.1/libev-3.2/ev.pod
 ext/revdispatch/libdispatch-0.1/libev-3.2/install-sh
-ext/revdispatch/libdispatch-0.1/libev-3.2/libev.la
 ext/revdispatch/libdispatch-0.1/libev-3.2/libev.m4
 ext/revdispatch/libdispatch-0.1/libev-3.2/ltmain.sh
 ext/revdispatch/libdispatch-0.1/libev-3.2/missing

data/ext/revdispatch/extconf.rb

@@ -15,6 +15,7 @@ if !File.exist?("#{libdispatch}/src/.libs") or !File.exist?("#{libdispatch}/#{li
 	# copy the .a files into this folder
 	system("cp #{libdispatch}/src/.libs/libdispatch.a libdeps")
 	system("cp #{libdispatch}/#{libev}/.libs/libev.a libdeps")
+	system("ranlib libdeps/*.a")
 end
 
 $srcs = ['revdispatch.cc']

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

@@ -183,27 +183,13 @@ void Dispatch::timeout_cb(struct ev_loop *loop, struct ev_timer *w, int revents)
 }
 
 // called on the main thread, not the event loop thread
-request_t Dispatch::request( Request::Type type, const std::string &url )
+request_t Dispatch::request( Request *req )
 {
   request_t key = m_counter++;
-  Request *req = NULL;
-  // check the request type and 
-  switch( type ) {
-  case Request::HTTP:
-    req = new HttpRequest( m_http_client, key, url );
-    break;
-  case Request::SPHINX:
-    //req = new SphinxRequest( key, url );
-    break;
-  case Request::MEMCACHED:
-    break;
-  default:
-    // TODO: log an error
-    break;
-  }
-  m_requests.push( req );
-  ev_async_send( m_loop, &m_request_watcher );
-  return key;
+  req->set_key( key );
+  m_requests.push( req ); // load the request into the request queue
+  ev_async_send( m_loop, &m_request_watcher ); // signal to the event loop we have new requests pending
+  return key; // return to the client a unique identifier for matching up the response to this request
 }
 
 Response *Dispatch::response_for( request_t id )

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

@@ -25,11 +25,15 @@ namespace EVD {
     Request( request_t k, const std::string &u ) : key(k), url(u){ time( &start_time); }
     virtual ~Request (){ }
 
+    // by default this does nothing, each real request object can do as it pleases with this feature
+    virtual void set_opt( const std::string &key, const std::string &value ){}
+ 
+    virtual void set_key( request_t key ){ this->key = key; }
+
     // attach to the event loop
     virtual bool enable() = 0;
 
-    // TODO: add a method to access the response
-
+    // key will be set by the dispatch object when you invoke this request
     request_t key;
     std::string url;
     time_t start_time;
@@ -224,7 +228,7 @@ namespace EVD {
     // tell the background event listener to terminate
     void stop();
 
-    request_t request( Request::Type type, const std::string &url );
+    request_t request( Request *req );
 
     // from the main thread, get the next available response
     // just keep pop'ing off the response queue until we get something
@@ -252,6 +256,8 @@ namespace EVD {
     inline struct ev_loop *get_loop(){ return m_loop; }
 
     inline pthread_t get_thread_id()const{ return m_tid; }
+ 
+    inline struct HttpClient *getHttpClient()const{ return m_http_client; }
 
   protected:
 

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

@@ -184,8 +184,8 @@ int HttpRequest::prog_cb(void *p, double dltotal, double dlnow, double ult, doub
   return 0;
 }
 
-HttpRequest::HttpRequest( HttpClient* client, request_t k, const std::string &url )
-  : Request( k, url ), response(NULL), m_handle(curl_easy_init()), m_client(client)
+HttpRequest::HttpRequest( Dispatch &dispatch, const std::string &url )
+  : Request( 0, url ), response(new Response()), m_handle(curl_easy_init()), m_client(dispatch.getHttpClient())
 {
   memset(error,'\0', CURL_ERROR_SIZE);
   curl_easy_setopt(m_handle, CURLOPT_URL, url.c_str());
@@ -197,9 +197,9 @@ HttpRequest::HttpRequest( HttpClient* client, request_t k, const std::string &ur
   curl_easy_setopt(m_handle, CURLOPT_NOPROGRESS, 0);
   curl_easy_setopt(m_handle, CURLOPT_PROGRESSFUNCTION, prog_cb);
   curl_easy_setopt(m_handle, CURLOPT_PROGRESSDATA, this);
-  this->response = new Response();
+
+  // setup the response object
   this->response->name = url;
-  this->response->id = k;
 }
 
 HttpRequest::~HttpRequest()

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

@@ -43,13 +43,15 @@ namespace EVD {
 
   // follow the curl handle for the duration of it's request
   struct HttpRequest : public Request {
-    HttpRequest( HttpClient* client, request_t k, const std::string &url );
+    HttpRequest( Dispatch &dispatch, const std::string &url );
     virtual ~HttpRequest();
 
     virtual bool enable();
 
     void finish( CURLcode rc );
 
+    virtual void set_key( request_t key ){ Request::set_key(key); this->response->id = key; }
+
     static size_t write_cb(void *ptr, size_t size, size_t nmemb, void *data);
     static int prog_cb(void *p, double dltotal, double dlnow, double ult, double uln);
 

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

@@ -1,4 +1,5 @@
 #include "ev_dispatch.h"
+#include "ev_http.h"
 
 using namespace EVD;
 
@@ -25,22 +26,21 @@ int main(int argc, char **argv)
 
   printf( "dispatcher thread running...\n" );
 
-  request_t yahoo_id = dispatcher.request(Request::HTTP, "http://www.yahoo.com/");
-  request_t google_id = dispatcher.request(Request::HTTP, "http://www.google.com/");
+  request_t yahoo_id = dispatcher.request( new HttpRequest( dispatcher, "http://www.yahoo.com/" ) );
+  request_t google_id = dispatcher.request(new HttpRequest( dispatcher, "http://www.google.com/" ) );
   printf("yahoo: %d\n", yahoo_id);
   printf("google: %d\n", google_id);
 
   Response *res = NULL;
-  Timer timeout(0,5);
 
-  while( dispatcher.wait_for_response_by_id( yahoo_id, timeout ) ){
+  while( dispatcher.wait_for_response_by_id( yahoo_id, Timer(1,5) ) ){
     printf("waiting for yahoo...\n");
   } 
   res = dispatcher.response_for( yahoo_id );
   printf("Recieved response from yahoo: %s, Content-Length: %d\n", res->name.c_str(), res->body.length() );
   delete res;
 
-  while( dispatcher.wait_for_response_by_id( google_id, timeout ) ){
+  while( dispatcher.wait_for_response_by_id( google_id, Timer(1,5) ) ){
     printf("waiting for google...\n");
   } 
 

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

@@ -1,4 +1,6 @@
+
 #include "ev_dispatch.h"
+#include "ev_http.h"
 
 using namespace EVD;
 
@@ -12,25 +14,17 @@ static void  SIGINT_handler(int sig)
 static void run_tests( Dispatch &dispatcher, int count )
 {
   time_t start_time = time(NULL);
-  int expected_response_count = 0;
   int response_count = 0;
 
-  dispatcher.request(Request::HTTP, "http://127.0.0.1:4044/bytes/10200/");
-  ++expected_response_count;
-  dispatcher.request(Request::HTTP, "http://127.0.0.1:4044/bytes/10080/");
-  ++expected_response_count;
-  dispatcher.request(Request::HTTP, "http://127.0.0.1:4044/delay/2/");
-  ++expected_response_count;
-  dispatcher.request(Request::HTTP, "http://127.0.0.1:4044/bytes/100900/");
-  ++expected_response_count;
-  dispatcher.request(Request::HTTP, "http://127.0.0.1:4044/delay/1/");
-  ++expected_response_count;
-  dispatcher.request(Request::HTTP, "http://127.0.0.1:4044/delay/1/");
-  ++expected_response_count;
-  dispatcher.request(Request::HTTP, "http://127.0.0.1:4044/delay/3/");
-  ++expected_response_count;
-  dispatcher.request(Request::HTTP, "http://127.0.0.1:4044/bytes/1010/");
-  ++expected_response_count;
+  dispatcher.request( new HttpRequest( dispatcher, "http://127.0.0.1:4044/bytes/10200/" ) );
+  dispatcher.request( new HttpRequest( dispatcher, "http://127.0.0.1:4044/bytes/10080/" ) );
+  dispatcher.request( new HttpRequest( dispatcher, "http://127.0.0.1:4044/delay/2/" ) );
+  dispatcher.request( new HttpRequest( dispatcher, "http://127.0.0.1:4044/bytes/100900/" ) );
+  dispatcher.request( new HttpRequest( dispatcher, "http://127.0.0.1:4044/delay/1/" ) );
+  dispatcher.request( new HttpRequest( dispatcher, "http://127.0.0.1:4044/delay/1/" ) );
+  dispatcher.request( new HttpRequest( dispatcher, "http://127.0.0.1:4044/delay/3/" ) );
+  dispatcher.request( new HttpRequest( dispatcher, "http://127.0.0.1:4044/bytes/1010/" ) );
+  int expected_response_count = 8 ;
 
   //ev_sleep(0.2);
 

data/ext/revdispatch/revdispatch.cc

@@ -1,5 +1,6 @@
 #include <ruby.h>
 #include "ev_dispatch.h"
+#include "ev_http.h"
 
 /* ruby 1.9 compat */
 #ifndef RSTRING_PTR
@@ -64,7 +65,7 @@ VALUE Loop_request_http( VALUE self, VALUE url )
   EVD::Dispatch *d;
   Data_Get_Struct( self, EVD::Dispatch, d );
 
-  EVD::request_t id = d->request( EVD::Request::HTTP, RSTRING_PTR(url) );
+  EVD::request_t id = d->request( new EVD::HttpRequest( *d, RSTRING_PTR(url) ) );
 
   return rb_int_new(id);
 }

data/ext/revdispatch/server.rb

@@ -45,7 +45,7 @@ class HelperApp
   end
 end
 
-def start
+def start_test_server
   puts "starting up ebb";
   Thread.start{ Ebb.start_server(HelperApp.new, :port => TEST_PORT) }
   sleep 0.1 until Ebb.running?

data/ext/revdispatch/test.rb

@@ -2,10 +2,11 @@ require 'revdispatch'
 
 # to run this through valgrind run the server outside of this script
 # i run this: valgrind --leak-check=full ~/project/ruby-valgrind-env/bin/ruby test.rb r
+pid = nil
 unless ARGV[0] == 'r'
   pid = fork do
     require 'server'
-    start
+    start_test_server
   end
 end
 
@@ -59,8 +60,8 @@ def run_trial
 
   ebbbase = "http://127.0.0.1:4044/"
   timer = Time.now
-  ids = request_bytes_from( d, ebbbase, 20, 1000 )
-  ids += request_delay_from( d, ebbbase, 20, 1 )
+  ids = request_bytes_from( d, ebbbase, 100, 1000 )
+  ids += request_delay_from( d, ebbbase, 100, 1 )
 
   # wait for each response
   puts "expecting #{ids.size} responses..."
@@ -74,27 +75,29 @@ def run_trial
 
   # sometime later you can stop the event loop
   d.stop
-
 end
 
-sleep 1 unless ARGV[0] == 'r'
+begin
+  sleep 1 unless ARGV[0] == 'r'
 
-ObjectSpace.garbage_collect
+  ObjectSpace.garbage_collect
 
-count = ObjectSpace.each_object { }
-puts "Starting Total objects: #{count}"
+  count = ObjectSpace.each_object { }
+  puts "Starting Total objects: #{count}"
 
-begin
-run_trial
-rescue => e
-  puts e.message, e.backtrace
-end
+  begin
+    run_trial
+  rescue => e
+    puts e.message, e.backtrace
+  end
 
 
-Process.kill('HUP', pid) unless ARGV[0] == 'r'
+  Process.kill('HUP', pid) unless ARGV[0] == 'r'
+  count = ObjectSpace.each_object { }
+  puts "Final Total objects: #{count}"
+  count = nil
+  ObjectSpace.garbage_collect
+end
 
-count = ObjectSpace.each_object { }
-puts "Final Total objects: #{count}"
-ObjectSpace.garbage_collect
 count = ObjectSpace.each_object { }
 puts "After garbage collection objects: #{count}"

data/lib/evdispatch/version.rb

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

data/test/test_evdispatch.rb

@@ -2,10 +2,92 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestEvdispatch < Test::Unit::TestCase
 
-  def setup
+  def test_object_test
+    # start up the test server
+    pid = fork do
+      require File.dirname(__FILE__) + '/../ext/revdispatch/server'
+      start_test_server
+    end
+    sleep 1 unless ARGV[0] == 'r'
+
+    d = Evdispatch::Loop.new
+
+    # start the event loop thread
+    d.start
+
+    begin
+
+      ObjectSpace.garbage_collect
+
+      10.times do
+        begin
+          start_count = ObjectSpace.each_object { }
+          duration =  run_trial(d, 10)
+          new_count = ObjectSpace.each_object { }
+          puts "10 trials: #{duration} seconds, new objects #{new_count - start_count}, #{new_count} - #{start_count}"
+        end
+
+        begin
+          start_count = ObjectSpace.each_object { }
+          duration = run_trial(d, 100)
+          new_count = ObjectSpace.each_object { }
+          puts "100 trials: #{duration} seconds, new objects #{new_count - start_count}, #{new_count} - #{start_count}"
+        end
+
+      end
+
+    rescue => e
+      puts e.message, e.backtrace
+    end
+
+    count = ObjectSpace.each_object { }
+    puts "Final Total objects: #{count}"
+    count = nil
+    ObjectSpace.garbage_collect
+    count = ObjectSpace.each_object { }
+    puts "After garbage collection objects: #{count}"
+ 
+    # sometime later you can stop the event loop
+    d.stop
+  ensure
+    Process.kill('HUP', pid) unless ARGV[0] == 'r'
   end
-  
-  def test_truth
-    assert true
+
+  def request_bytes_from( d, base, amount, range )
+    ids = []
+    amount.times do|i|
+      am = rand( range )
+      ids << d.request_http( base + "bytes/#{am}/" )
+    end
+    ids
+  end
+
+  def request_delay_from( d, base, amount, delay )
+    ids = []
+    amount.times do|i|
+      am = rand( delay )
+      ids << d.request_http( base + "delay/#{delay}/" )
+    end
+    ids
+  end
+
+  def run_trial( d, trials )
+
+    ebbbase = "http://127.0.0.1:4044/"
+    timer = Time.now
+    ids = request_bytes_from( d, ebbbase, trials, 1000 )
+    ids += request_delay_from( d, ebbbase, trials, 1 )
+
+    # wait for each response
+    puts "expecting #{ids.size} responses..."
+    ids.each do|id|
+      response = d.response( id )
+      #puts response[:name]
+    end
+
+    duration = Time.now - timer
+
+
+    duration
   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.1.2</a>
+      <a href="http://rubyforge.org/projects/evdispatch" class="numbers">0.1.3</a>
     </div>
     <h4 style="float:right;padding-right:10px;">&#x2192; &#8216;evdispatch&#8217;</h4>
 
@@ -152,8 +152,6 @@ One thing to keep in mind is the background thread will block if it has to resol
     </p>
 </div>
 
-<!-- insert site tracking codes here, like Google Urchin -->
-
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
   <script type="text/javascript">
     window.onload = function() {
@@ -170,6 +168,15 @@ One thing to keep in mind is the background thread will block if it has to resol
       versionBox.applyCornersToAll();
     }
   </script>
+  <script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+  </script>
+  <script type="text/javascript">
+  var pageTracker = _gat._getTracker("UA-246931-5");
+  pageTracker._initData();
+  pageTracker._trackPageview();
+  </script>
 
 </body>
 </html>

data/website/template.html.erb

@@ -27,8 +27,6 @@
     </p>
 </div>
 
-<!-- insert site tracking codes here, like Google Urchin -->
-
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
   <script type="text/javascript">
     window.onload = function() {
@@ -45,6 +43,15 @@
       versionBox.applyCornersToAll();
     }
   </script>
+  <script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+  </script>
+  <script type="text/javascript">
+  var pageTracker = _gat._getTracker("UA-246931-5");
+  pageTracker._initData();
+  pageTracker._trackPageview();
+  </script>
 
 </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evdispatch
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Todd A. Fisher
@@ -108,7 +108,6 @@ files:
 - ext/revdispatch/libdispatch-0.1/libev-3.2/ev.3
 - ext/revdispatch/libdispatch-0.1/libev-3.2/ev.pod
 - ext/revdispatch/libdispatch-0.1/libev-3.2/install-sh
-- ext/revdispatch/libdispatch-0.1/libev-3.2/libev.la
 - ext/revdispatch/libdispatch-0.1/libev-3.2/libev.m4
 - ext/revdispatch/libdispatch-0.1/libev-3.2/ltmain.sh
 - ext/revdispatch/libdispatch-0.1/libev-3.2/missing
@@ -147,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: evdispatch
-rubygems_version: 1.1.0
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Based on libev provides a background event loop for making simulataneous requests

data/ext/revdispatch/libdispatch-0.1/libev-3.2/libev.la

@@ -1,35 +0,0 @@
-# libev.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5.24 (1.1220.2.456 2007/06/24 02:25:32)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libev.3.dylib'
-
-# Names of this library.
-library_names='libev.3.0.0.dylib libev.3.dylib libev.dylib'
-
-# The name of the static archive.
-old_library='libev.a'
-
-# Libraries that this one depends upon.
-dependency_libs=' -lm'
-
-# Version information for libev.
-current=3
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=no
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/local/lib'