taf2-curb 0.4.6.0 → 0.4.8.0

data/ext/curb.h

@@ -20,20 +20,21 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.4.6.0"
-#define CURB_VER_NUM   460
+#define CURB_VERSION   "0.4.8.0"
+#define CURB_VER_NUM   480
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   4
-#define CURB_VER_MIC   6
+#define CURB_VER_MIC   8
 #define CURB_VER_PATCH 0
 
 
 // Maybe not yet defined in Ruby
 #ifndef RSTRING_LEN
-#define RSTRING_LEN(x) RSTRING(x)->len
+  #define RSTRING_LEN(x) RSTRING(x)->len
 #endif
+
 #ifndef RSTRING_PTR
-#define RSTRING_PTR(x) RSTRING(x)->ptr
+  #define RSTRING_PTR(x) RSTRING(x)->ptr
 #endif
 
 #ifdef HAVE_RUBY19_HASH

data/ext/curb_easy.c

@@ -8,6 +8,7 @@
 #include "curb_errors.h"
 #include "curb_postfield.h"
 #include "curb_upload.h"
+#include "curb_multi.h"
 
 #include <errno.h>
 #include <string.h>
@@ -1716,147 +1717,16 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce, VALUE bodybuf, V
  */
 static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) {
 
-  CURLcode result = -1;
-  struct curl_slist *headers = NULL;
-  VALUE bodybuf = Qnil, headerbuf = Qnil;
-//  char errors[CURL_ERROR_SIZE*2];
+  VALUE multi = ruby_curl_multi_new(cCurlMulti);
+  ruby_curl_multi_add(multi, self);
+  VALUE ret = ruby_curl_multi_perform(multi);
 
-  ruby_curl_easy_setup(rbce, &bodybuf, &headerbuf, &headers);
-//  curl_easy_setopt(rbce->curl, CURLOPT_ERRORBUFFER, errors);
-//  curl_easy_setopt(rbce->curl, CURLOPT_VERBOSE, 1);
-
-  if( rb_thread_alone() ) {
-    result = curl_easy_perform(rbce->curl);
+  /* check for errors in the easy response and raise exceptions if anything went wrong and their is no on_failure handler */
+  if( rbce->last_result != 0 && rbce->failure_proc == Qnil ) {
+    raise_curl_easy_error_exception(rbce->last_result);
   }
-  else {
-    int msgs;
-    int still_running = 1;
-    CURLMcode mcode = -1;
-    CURLM *multi_handle = curl_multi_init();
-    long timeout;
-    struct timeval tv = {0, 0};
-    int rc; /* select() return code */
-    int maxfd;
-
-    /* NOTE:
-     * We create an Curl multi handle here and use rb_thread_select allowing other ruby threads to
-     * perform actions... ideally we'd have just 1 shared multi handle per all curl easy handles globally
-     */
-    mcode = curl_multi_add_handle(multi_handle, rbce->curl);
-    if (mcode != CURLM_CALL_MULTI_PERFORM && mcode != CURLM_OK) {
-      raise_curl_multi_error_exception(mcode);
-    }
-
-    while(CURLM_CALL_MULTI_PERFORM == (mcode=curl_multi_perform(multi_handle, &still_running)) ) ;
-
-    if (mcode != CURLM_CALL_MULTI_PERFORM && mcode != CURLM_OK) {
-      raise_curl_multi_error_exception(mcode);
-    }
-
-
-    while(still_running) {
-
-      fd_set fdread;
-      fd_set fdwrite;
-      fd_set fdexcep;
-
-      FD_ZERO(&fdread);
-      FD_ZERO(&fdwrite);
-      FD_ZERO(&fdexcep);
-
-      //time_t timer = time(NULL);
-      /* get file descriptors from the transfers */
-      mcode = curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
-      if (mcode != CURLM_CALL_MULTI_PERFORM && mcode != CURLM_OK) {
-        raise_curl_multi_error_exception(mcode);
-      }
-
-#ifdef HAVE_CURL_MULTI_TIMEOUT
-      /* get the curl suggested time out */
-      mcode = curl_multi_timeout(multi_handle, &timeout);
-      if (mcode != CURLM_OK) {
-        raise_curl_multi_error_exception(mcode);
-      }
-#else
-      /* libcurl doesn't have a timeout method defined... make a wild guess */
-      timeout = 1; /* wait a second */
-#endif
-
-      if (timeout == 0) { /* no delay */
-        while(CURLM_CALL_MULTI_PERFORM == (mcode=curl_multi_perform(multi_handle, &still_running)) );
-        continue;
-      }
-      else if (timeout == -1) {
-        timeout = 1; /* wait a second */
-      }
-
-      /* set a suitable timeout to play around with - ruby seems to be greedy about this and won't necessarily yield so the timeout is small.. */
-      tv.tv_sec = timeout / 1000;
-      tv.tv_usec = (timeout * 1000) % 1000000;
-      rc = rb_thread_select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv);
-      if (rc < 0) {
-        rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno));
-      }
 
-      if( rc >= 0 ) {
-        switch(rc) {
-        case 0:
-          //printf("timeout(%.6f) :", difftime(time(NULL), timer) );
-        default:
-          //printf("readable/writable: %d\n", rc);
-          /* timeout or readable/writable sockets */
-          while(CURLM_CALL_MULTI_PERFORM == (mcode=curl_multi_perform(multi_handle, &still_running)) );
-          break;
-        }
-      }
-      else {
-        // error
-      }
-
-      if (mcode != CURLM_CALL_MULTI_PERFORM && mcode != CURLM_OK) {
-        raise_curl_multi_error_exception(mcode);
-      }
-
-    }
-
-    /* check for errors */
-    CURLMsg *msg = curl_multi_info_read(multi_handle, &msgs);
-    if (msg && msg->msg == CURLMSG_DONE) {
-      result = msg->data.result;
-    }
-
-    curl_multi_remove_handle(multi_handle, rbce->curl);
-    curl_multi_cleanup(multi_handle);
-  }
-
-  ruby_curl_easy_cleanup(self, rbce, bodybuf, headerbuf, headers);
-
-  if (rbce->complete_proc != Qnil) {
-    rb_funcall( rbce->complete_proc, idCall, 1, self );
-  }
-
-  /* check the request status and determine if on_success or on_failure should be called */
-  long response_code = -1;
-  curl_easy_getinfo(rbce->curl, CURLINFO_RESPONSE_CODE, &response_code);
-  if (result != 0) {
-//    printf("error: %s\n", errors);
-    if (rbce->failure_proc != Qnil) {
-      rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, rb_curl_easy_error(result) );
-    } else {
-      raise_curl_easy_error_exception(result);
-    }
-  }
-  else if (rbce->success_proc != Qnil &&
-           /* NOTE: we allow response_code == 0, in the case the file is being read from disk */
-           ((response_code >= 200 && response_code < 300) || response_code == 0)) {
-    rb_funcall( rbce->success_proc, idCall, 1, self );
-  }
-  else if (rbce->failure_proc != Qnil &&
-           (response_code >= 300 && response_code <= 999)) {
-    rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, rb_curl_easy_error(result) );
-  }
-
-  return Qtrue;
+  return ret;
 }
 
 /*

data/ext/curb_easy.h

@@ -89,6 +89,8 @@ typedef struct {
   VALUE self; /* pointer to self, used by multi interface */
   VALUE upload; /* pointer to an active upload otherwise Qnil */
 
+  int last_result; /* last result code from multi loop */
+
 } ruby_curl_easy;
 
 extern VALUE cCurlEasy;

data/ext/curb_multi.c

@@ -6,9 +6,11 @@
 
 #include "curb_config.h"
 #ifdef HAVE_RUBY19_ST_H
-#include <ruby/st.h>
+  #include <ruby.h>
+  #include <ruby/st.h>
 #else
-#include <st.h>
+  #include <ruby.h>
+  #include <st.h>
 #endif
 #include "curb_easy.h"
 #include "curb_errors.h"
@@ -26,7 +28,6 @@ static VALUE idCall;
 
 VALUE cCurlMulti;
 
-static VALUE ruby_curl_multi_remove(VALUE , VALUE );
 static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy);
 static void rb_curl_multi_read_info(VALUE self, CURLM *mptr);
 
@@ -76,7 +77,7 @@ static void curl_multi_free(ruby_curl_multi *rbcm) {
  *
  * Create a new Curl::Multi instance
  */
-static VALUE ruby_curl_multi_new(VALUE klass) {
+VALUE ruby_curl_multi_new(VALUE klass) {
   VALUE new_curlm;
 
   ruby_curl_multi *rbcm = ALLOC(ruby_curl_multi);
@@ -186,7 +187,7 @@ static VALUE ruby_curl_multi_pipeline(VALUE self, VALUE onoff) {
  *
  * Add an easy handle to the multi stack
  */
-static VALUE ruby_curl_multi_add(VALUE self, VALUE easy) {
+VALUE ruby_curl_multi_add(VALUE self, VALUE easy) {
   CURLMcode mcode;
   ruby_curl_easy *rbce;
   ruby_curl_multi *rbcm;
@@ -234,7 +235,7 @@ static VALUE ruby_curl_multi_add(VALUE self, VALUE easy) {
  *
  * Will raise an exception if the easy handle is not found
  */
-static VALUE ruby_curl_multi_remove(VALUE self, VALUE easy) {
+VALUE ruby_curl_multi_remove(VALUE self, VALUE easy) {
   ruby_curl_multi *rbcm;
 
   Data_Get_Struct(self, ruby_curl_multi, rbcm);
@@ -316,6 +317,7 @@ static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {
       if (ecode != 0) {
         raise_curl_easy_error_exception(ecode);
       }
+      rbce->last_result = result; // save the last easy result code
       ruby_curl_multi_remove( self, rbce->self );
 
       if (rbce->complete_proc != Qnil) {
@@ -377,7 +379,7 @@ static void rb_curl_multi_run(VALUE self, CURLM *multi_handle, int *still_runnin
  *
  * Run multi handles, looping selecting when data can be transfered
  */
-static VALUE ruby_curl_multi_perform(VALUE self) {
+VALUE ruby_curl_multi_perform(VALUE self) {
   CURLMcode mcode;
   ruby_curl_multi *rbcm;
   int maxfd, rc;
@@ -437,7 +439,7 @@ static VALUE ruby_curl_multi_perform(VALUE self) {
 
   }
 
-  return Qnil;
+  return Qtrue;
 }
 
 /* =================== INIT LIB =====================*/

data/ext/curb_multi.h

@@ -20,6 +20,10 @@ typedef struct {
 
 extern VALUE cCurlMulti;
 void init_curb_multi();
+VALUE ruby_curl_multi_new(VALUE klass);
+VALUE ruby_curl_multi_perform(VALUE self);
+VALUE ruby_curl_multi_add(VALUE self, VALUE easy);
+VALUE ruby_curl_multi_remove(VALUE self, VALUE easy);
 
 
 #endif

data/tests/helper.rb

@@ -21,7 +21,7 @@ require 'webrick'
 # or to test with multiple threads set it to false
 # this is important since, some code paths will change depending
 # on the presence of multiple threads
-TEST_SINGLE_THREADED=true
+TEST_SINGLE_THREADED=false
 
 # keep webrick quiet
 class ::WEBrick::HTTPServer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.4.6.0
+  version: 0.4.8.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-19 00:00:00 -07:00
+date: 2009-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,18 +32,18 @@ files:
 - lib/curb.rb
 - lib/curl.rb
 - ext/curb.c
-- ext/curb_easy.c
-- ext/curb_errors.c
-- ext/curb_multi.c
 - ext/curb_postfield.c
+- ext/curb_multi.c
+- ext/curb_errors.c
+- ext/curb_easy.c
 - ext/curb_upload.c
-- ext/curb.h
 - ext/curb_easy.h
 - ext/curb_errors.h
+- ext/curb_upload.h
 - ext/curb_macros.h
-- ext/curb_multi.h
+- ext/curb.h
 - ext/curb_postfield.h
-- ext/curb_upload.h
+- ext/curb_multi.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 post_install_message: 
@@ -73,15 +73,15 @@ signing_key:
 specification_version: 2
 summary: Ruby libcurl bindings
 test_files: 
-- tests/alltests.rb
+- tests/tc_curl_multi.rb
+- tests/tc_curl_postfield.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
-- tests/bug_instance_post_differs_from_class_post.rb
-- tests/bug_multi_segfault.rb
+- tests/unittests.rb
 - tests/bug_require_last_or_segfault.rb
-- tests/helper.rb
-- tests/require_last_or_segfault_script.rb
+- tests/bug_instance_post_differs_from_class_post.rb
 - tests/tc_curl_download.rb
+- tests/alltests.rb
+- tests/helper.rb
 - tests/tc_curl_easy.rb
-- tests/tc_curl_multi.rb
-- tests/tc_curl_postfield.rb
-- tests/unittests.rb
+- tests/bug_multi_segfault.rb
+- tests/require_last_or_segfault_script.rb