evdispatch 0.1.4 → 0.1.5

data/History.txt

@@ -1,3 +1,6 @@
+== 0.1.5 2008-04-11
+* Fix a regression on linux caused from a fix to ppc
+
 == 0.1.4 2008-04-11
 * Fix another issue with building this time on ppc it needs ranlib executed
 

data/ext/revdispatch/extconf.rb

@@ -15,7 +15,10 @@ 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")
+  if( `uname`.grep(/darwin/i) )
+    puts "running ranlib"
+    system("ranlib libdeps/*.a")
+  end
 end
 
 $srcs = ['revdispatch.cc']
@@ -25,7 +28,9 @@ $objs = ['revdispatch.o']
 $CPPFLAGS = " -I./#{libdispatch}/ -I./#{libdispatch}/src -I./#{libdispatch}/#{libev}/ #{$CPPFLAGS}"
 
 # link to the static library versions of libdispatch and #{libev}
-#$LDFLAGS << " ./#{libdispatch}/src/.libs/libdispatch.a ./#{libdispatch}/#{libev}/.libs/libev.a "
+if( `uname`.grep(/linux/i) )
+$LDFLAGS << " ./#{libdispatch}/src/.libs/libdispatch.a ./#{libdispatch}/#{libev}/.libs/libev.a "
+end
 #$LIBS << " -L./#{libdispatch}/#{libev}/.libs/ -lev"
 #$LIBS << " -L./#{libdispatch}/src/.libs/ -ldispatch"
 $LIBS << " -Llibdeps -lev -ldispatch"

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

@@ -170,8 +170,13 @@ size_t HttpRequest::write_cb(void *ptr, size_t size, size_t nmemb, void *data)
   size_t realsize = size * nmemb;
   HttpRequest *req = (HttpRequest *)data;
 
-  req->response->body.append((const char*)ptr,realsize);
-  //fprintf(stderr, "Write: %s (%lu) => (%d)%s\n", req->url.c_str(), realsize, (int)req->response, req->response->body.c_str() );
+  if( req->response ) {
+    req->response->body.append((const char*)ptr,realsize);
+    //fprintf(stderr, "Write: %s (%lu) => (%d)%s\n", req->url.c_str(), realsize, (int)req->response, req->response->body.c_str() );
+  }
+  else if( req->m_fd ) {
+    write( req->m_fd, ptr, realsize );
+  }
 
   return realsize;
 }
@@ -202,6 +207,12 @@ HttpRequest::HttpRequest( Dispatch &dispatch, const std::string &url )
   this->response->name = url;
 }
 
+void HttpRequest::set_response_fd( int fd )
+{
+  if( this->response ){ delete this->response; this->response = NULL; }
+  m_fd = fd;
+}
+
 HttpRequest::~HttpRequest()
 {
   curl_easy_cleanup( m_handle );
@@ -228,10 +239,15 @@ void HttpRequest::finish(CURLcode rc)
 {
   curl_multi_remove_handle( m_client->m_handle, m_handle );
 
-  // add the response object here to the responses queue in the dispatcher?
-  // signaling to any waiting clients that their response is available
-  this->response->response_time = difftime( time(NULL), this->start_time );
-  m_client->m_disp->send_response( this->response );
+  if( this->response ) {
+    // add the response object here to the responses queue in the dispatcher?
+    // signaling to any waiting clients that their response is available
+    this->response->response_time = difftime( time(NULL), this->start_time );
+    m_client->m_disp->send_response( this->response );
+  }
+  else {
+    close( this->m_fd );
+  }
   //fprintf( stderr, "DONE: (%s/%s) => (%d), body(%d): '%s'\n", url.c_str(), url.c_str(), rc, (int)this->response, this->response->body.c_str() );
 }
 

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

@@ -50,7 +50,11 @@ namespace EVD {
 
     void finish( CURLcode rc );
 
-    virtual void set_key( request_t key ){ Request::set_key(key); this->response->id = key; }
+    virtual void set_key( request_t key ){ Request::set_key(key); if( this->response ) this->response->id = key; }
+
+    // use this to have the response be written to the file instead, using a response object.
+    // you can not get the response to return over the normal get_next_response or wait_for_response_by_id method if you use this.
+    void set_response_fd( int fd );
 
     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);
@@ -60,6 +64,7 @@ namespace EVD {
     CURL *m_handle;
     HttpClient *m_client;
     char error[CURL_ERROR_SIZE];
+    int m_fd;
   };
 
 }

data/ext/revdispatch/libdispatch-0.1/test/Makefile.am

@@ -1,4 +1,4 @@
-bin_PROGRAMS = next_test key_test
+bin_PROGRAMS = next_test key_test pipe_test
 next_test_SOURCES = next_test.cc
 next_test_CPPFLAGS = -I$(top_srcdir)/src/ -I$(LIBEV_PATH)
 next_test_LDADD = -ldispatch -lev
@@ -9,8 +9,7 @@ key_test_CPPFLAGS = -I$(top_srcdir)/src/ -I$(LIBEV_PATH)
 key_test_LDADD = -ldispatch -lev
 key_test_LDFLAGS = -L$(top_srcdir)/src/.libs/ `curl-config --libs` -L$(LIBEV_PATH)/.libs/
 
-test_next: next_test
-	.libs/next_test
-
-test_key: key_test
-	.libs/key_test
+pipe_test_SOURCES = pipe_test.cc
+pipe_test_CPPFLAGS = -I$(top_srcdir)/src/ -I$(LIBEV_PATH)
+pipe_test_LDADD = -ldispatch -lev
+pipe_test_LDFLAGS = -L$(top_srcdir)/src/.libs/ `curl-config --libs` -L$(LIBEV_PATH)/.libs/

data/ext/revdispatch/libdispatch-0.1/test/Makefile.in

@@ -32,7 +32,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = next_test$(EXEEXT) key_test$(EXEEXT)
+bin_PROGRAMS = next_test$(EXEEXT) key_test$(EXEEXT) pipe_test$(EXEEXT)
 subdir = test
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -58,6 +58,12 @@ next_test_DEPENDENCIES =
 next_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(next_test_LDFLAGS) $(LDFLAGS) -o $@
+am_pipe_test_OBJECTS = pipe_test-pipe_test.$(OBJEXT)
+pipe_test_OBJECTS = $(am_pipe_test_OBJECTS)
+pipe_test_DEPENDENCIES =
+pipe_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(pipe_test_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -70,8 +76,10 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(key_test_SOURCES) $(next_test_SOURCES)
-DIST_SOURCES = $(key_test_SOURCES) $(next_test_SOURCES)
+SOURCES = $(key_test_SOURCES) $(next_test_SOURCES) \
+	$(pipe_test_SOURCES)
+DIST_SOURCES = $(key_test_SOURCES) $(next_test_SOURCES) \
+	$(pipe_test_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -191,6 +199,10 @@ key_test_SOURCES = key_test.cc
 key_test_CPPFLAGS = -I$(top_srcdir)/src/ -I$(LIBEV_PATH)
 key_test_LDADD = -ldispatch -lev
 key_test_LDFLAGS = -L$(top_srcdir)/src/.libs/ `curl-config --libs` -L$(LIBEV_PATH)/.libs/
+pipe_test_SOURCES = pipe_test.cc
+pipe_test_CPPFLAGS = -I$(top_srcdir)/src/ -I$(LIBEV_PATH)
+pipe_test_LDADD = -ldispatch -lev
+pipe_test_LDFLAGS = -L$(top_srcdir)/src/.libs/ `curl-config --libs` -L$(LIBEV_PATH)/.libs/
 all: all-am
 
 .SUFFIXES:
@@ -258,6 +270,9 @@ key_test$(EXEEXT): $(key_test_OBJECTS) $(key_test_DEPENDENCIES)
 next_test$(EXEEXT): $(next_test_OBJECTS) $(next_test_DEPENDENCIES) 
 	@rm -f next_test$(EXEEXT)
 	$(next_test_LINK) $(next_test_OBJECTS) $(next_test_LDADD) $(LIBS)
+pipe_test$(EXEEXT): $(pipe_test_OBJECTS) $(pipe_test_DEPENDENCIES) 
+	@rm -f pipe_test$(EXEEXT)
+	$(pipe_test_LINK) $(pipe_test_OBJECTS) $(pipe_test_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -267,6 +282,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_test-key_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/next_test-next_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe_test-pipe_test.Po@am__quote@
 
 .cc.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -317,6 +333,20 @@ next_test-next_test.obj: next_test.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(next_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o next_test-next_test.obj `if test -f 'next_test.cc'; then $(CYGPATH_W) 'next_test.cc'; else $(CYGPATH_W) '$(srcdir)/next_test.cc'; fi`
 
+pipe_test-pipe_test.o: pipe_test.cc
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pipe_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pipe_test-pipe_test.o -MD -MP -MF $(DEPDIR)/pipe_test-pipe_test.Tpo -c -o pipe_test-pipe_test.o `test -f 'pipe_test.cc' || echo '$(srcdir)/'`pipe_test.cc
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/pipe_test-pipe_test.Tpo $(DEPDIR)/pipe_test-pipe_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='pipe_test.cc' object='pipe_test-pipe_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pipe_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pipe_test-pipe_test.o `test -f 'pipe_test.cc' || echo '$(srcdir)/'`pipe_test.cc
+
+pipe_test-pipe_test.obj: pipe_test.cc
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pipe_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pipe_test-pipe_test.obj -MD -MP -MF $(DEPDIR)/pipe_test-pipe_test.Tpo -c -o pipe_test-pipe_test.obj `if test -f 'pipe_test.cc'; then $(CYGPATH_W) 'pipe_test.cc'; else $(CYGPATH_W) '$(srcdir)/pipe_test.cc'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/pipe_test-pipe_test.Tpo $(DEPDIR)/pipe_test-pipe_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='pipe_test.cc' object='pipe_test-pipe_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pipe_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pipe_test-pipe_test.obj `if test -f 'pipe_test.cc'; then $(CYGPATH_W) 'pipe_test.cc'; else $(CYGPATH_W) '$(srcdir)/pipe_test.cc'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -502,12 +532,6 @@ uninstall-am: uninstall-binPROGRAMS
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-binPROGRAMS
 
-
-test_next: next_test
-	.libs/next_test
-
-test_key: key_test
-	.libs/key_test
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

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

@@ -29,10 +29,9 @@ static void run_tests( Dispatch &dispatcher, int count )
   //ev_sleep(0.2);
 
   Response *rep = NULL;
-  Timer timeout(2,0);
   double longest_request = 0.0;
 
-  while( expected_response_count > 0 && (rep = dispatcher.get_next_response(timeout)) ){
+  while( expected_response_count > 0 && (rep = dispatcher.get_next_response(Timer(1,0))) ){
     if( longest_request < rep->response_time ){
       longest_request = rep->response_time;
     }

data/ext/revdispatch/server.rb

@@ -58,3 +58,6 @@ def start_test_server
   # keep process alive
   sleep 0.5 while Ebb.running?
 end
+if( ARGV[0] == "start" )
+  start_test_server
+end

data/ext/revdispatch/test.rb

@@ -3,7 +3,8 @@ 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'
+running_ebb_here = (ARGV[0] != 'r' and !`uname`.grep(/darwin/i))
+if running_ebb_here 
   pid = fork do
     require 'server'
     start_test_server
@@ -78,7 +79,7 @@ def run_trial
 end
 
 begin
-  sleep 1 unless ARGV[0] == 'r'
+  sleep 1 if running_ebb_here
 
   ObjectSpace.garbage_collect
 
@@ -92,7 +93,6 @@ begin
   end
 
 
-  Process.kill('HUP', pid) unless ARGV[0] == 'r'
   count = ObjectSpace.each_object { }
   puts "Final Total objects: #{count}"
   count = nil
@@ -101,3 +101,4 @@ end
 
 count = ObjectSpace.each_object { }
 puts "After garbage collection objects: #{count}"
+Process.kill('HUP', pid) if running_ebb_here

data/lib/evdispatch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evdispatch
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Todd A. Fisher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-11 00:00:00 -04:00
+date: 2008-04-12 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: evdispatch
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
 summary: Based on libev provides a background event loop for making simulataneous requests