evdispatch 0.2.0 → 0.2.1

data/Manifest.txt

@@ -93,3 +93,5 @@ ext/revdispatch/libdispatch-0.1/test/Makefile.am
 ext/revdispatch/libdispatch-0.1/test/Makefile.in
 ext/revdispatch/libdispatch-0.1/test/key_test.cc
 ext/revdispatch/libdispatch-0.1/test/next_test.cc
+ext/revdispatch/libdispatch-0.1/test/pipe_test.cc
+ext/revdispatch/libdispatch-0.1/test/opt_test.cc

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

@@ -0,0 +1,64 @@
+#include "ev_dispatch.h"
+#include "ev_http.h"
+#include <sys/select.h>
+#include <errno.h>
+
+using namespace EVD;
+
+
+// catch SIGINT to kill process 
+static void  SIGINT_handler(int sig)
+{
+  exit(sig);
+}
+
+static void run_tests( Dispatch &dispatcher, int count )
+{
+  time_t start_time = time(NULL);
+
+  // tell the request to stream the response over this file descriptor
+  HttpRequest *req = new HttpRequest( dispatcher, "http://127.0.0.1:4044/redir/2" );
+  req->set_opt("port", "4044");
+  req->set_opt("followlocation", "1");
+  //req->set_opt("maxredirs", "1");
+  req->set_opt("referer", "/delay/10");
+  req->set_opt("useragent", "users are us");
+  req->set_opt("cookie", "name1=content1; name2=content2;");
+
+  request_t id = dispatcher.request( req );
+
+  while( dispatcher.wait_for_response_by_id( id, Timer(1,5) ) ) {
+    printf("waiting...\n");
+  }
+  HttpResponse *res = (HttpResponse *)dispatcher.response_for( id );
+  printf("response: %s, in %.5lf seconds of Content-Length: %d bytes\n%s%s\n", res->name.c_str(), res->response_time, res->body.length(), res->m_header.c_str(), res->body.c_str() );
+  delete res;
+}
+
+int main(int argc, char **argv)
+{
+  Dispatch dispatcher;
+
+  if (signal(SIGINT, SIGINT_handler) == SIG_ERR) {
+    printf("SIGINT install error\n");
+    exit(1);
+  }
+
+  if( !dispatcher.start() ){
+    fprintf( stderr, "Failed to start up dispatcher\n" );
+    return 1;
+  }
+
+  printf( "dispatcher thread running...\n" );
+
+  struct timeval start_time;
+  Timer::current_time(&start_time);
+
+  run_tests( dispatcher, 10 );
+
+  printf( "total time: %.5f seconds\n", Timer::elapsed_time( &start_time ) );
+
+  dispatcher.stop();
+
+  return 0;
+}

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

@@ -0,0 +1,98 @@
+#include "ev_dispatch.h"
+#include "ev_http.h"
+#include <sys/select.h>
+#include <errno.h>
+
+using namespace EVD;
+
+
+// catch SIGINT to kill process 
+static void  SIGINT_handler(int sig)
+{
+  exit(sig);
+}
+
+static void run_tests( Dispatch &dispatcher, int count )
+{
+  time_t start_time = time(NULL);
+  int response_count = 0;
+  int pfd[2];
+
+  if( pipe( pfd ) ) {
+    perror("pipe");
+    return;
+  }
+
+  // tell the request to stream the response over this file descriptor
+  HttpRequest *req = new HttpRequest( dispatcher, "http://www.google.com/", pfd[1] );
+  HttpResponse *res = req->m_response;
+
+  dispatcher.request( req );
+
+  // select the response on this thread
+  int retval;
+  fd_set rd, wr, er;
+  struct timeval tv;
+  const int read_size = 1024;
+  char READ_BUFFER[read_size];
+  std::string result_buffer;
+
+  FD_ZERO(&rd);
+  FD_ZERO(&wr);
+  FD_ZERO(&er);
+  FD_SET(pfd[0], &rd);
+  tv.tv_sec = 0;
+  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;
+        }
+      }
+    }
+    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" );
+}
+
+int main(int argc, char **argv)
+{
+  Dispatch dispatcher;
+
+  if (signal(SIGINT, SIGINT_handler) == SIG_ERR) {
+    printf("SIGINT install error\n");
+    exit(1);
+  }
+
+  if( !dispatcher.start() ){
+    fprintf( stderr, "Failed to start up dispatcher\n" );
+    return 1;
+  }
+
+  printf( "dispatcher thread running...\n" );
+
+  struct timeval start_time;
+  Timer::current_time(&start_time);
+
+  run_tests( dispatcher, 10 );
+
+  printf( "total time: %.5f seconds\n", Timer::elapsed_time( &start_time ) );
+
+  dispatcher.stop();
+
+  return 0;
+}

data/lib/evdispatch/version.rb

@@ -2,7 +2,7 @@ module Evdispatch #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     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.1.5</a>
+      <a href="http://rubyforge.org/projects/evdispatch" class="numbers">0.2.0</a>
     </div>
     <h4 style="float:right;padding-right:10px;">&#x2192; &#8216;evdispatch&#8217;</h4>
 

data/website/index.txt

@@ -31,9 +31,9 @@ For example in rails this might look like:
 
   class DashController < ApplicationController
     def index
-      @blogs_id = $dispatcher.request_http("http://10.0.6.45/service/blogs")
-      @news_id = $dispatcher.request_http("http://10.0.6.45/service/news")
-      @messages_id = $dispatcher.request_http("http://10.0.6.45/service/messages")
+      @blogs_id = $dispatcher.request("http://10.0.6.45/service/blogs")
+      @news_id = $dispatcher.request("http://10.0.6.45/service/news")
+      @messages_id = $dispatcher.request("http://10.0.6.45/service/messages")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evdispatch
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Todd A. Fisher
@@ -122,6 +122,8 @@ files:
 - ext/revdispatch/libdispatch-0.1/test/Makefile.in
 - ext/revdispatch/libdispatch-0.1/test/key_test.cc
 - ext/revdispatch/libdispatch-0.1/test/next_test.cc
+- ext/revdispatch/libdispatch-0.1/test/pipe_test.cc
+- ext/revdispatch/libdispatch-0.1/test/opt_test.cc
 has_rdoc: true
 homepage: http://evdispatch.rubyforge.org
 post_install_message: