@@ -8,6 +8,7 @@ #include "curb_errors.h" #include "curb_postfield.h" +#include <errno.h> #include <string.h> extern VALUE mCurl; @@ -1352,13 +1353,87 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce, VALUE bodybuf, V */ static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) { + int msgs; + int still_running = 1; CURLcode result = -1; + CURLMcode mcode = -1; + CURLM *multi_handle = curl_multi_init(); struct curl_slist *headers = NULL; VALUE bodybuf = Qnil, headerbuf = Qnil; ruby_curl_easy_setup(rbce, &bodybuf, &headerbuf, &headers); - result = curl_easy_perform(rbce->curl); + /* 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) { + struct timeval timeout; + int rc; /* select() return code */ + int maxfd; + + fd_set fdread; + fd_set fdwrite; + fd_set fdexcep; + + FD_ZERO(&fdread); + FD_ZERO(&fdwrite); + FD_ZERO(&fdexcep); + + /* set a suitable timeout to play around with */ + timeout.tv_sec = 1; + timeout.tv_usec = 0; + /* 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); + } + + rc = rb_thread_select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout); + if (rc < 0) { + rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno)); + } + + switch(rc) { + case 0: /* timeout */ + default: + /* timeout or readable/writable sockets */ + while(CURLM_CALL_MULTI_PERFORM == (mcode=curl_multi_perform(multi_handle, &still_running)) ); + break; + } + + 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) { + result = msg->data.result; + } + else { + long val; + curl_easy_getinfo( rbce->curl, CURLINFO_OS_ERRNO, &val ); + result = val; + } + + curl_multi_remove_handle(multi_handle, rbce->curl); + curl_multi_cleanup(multi_handle); + + //result = curl_easy_perform(rbce->curl); ruby_curl_easy_cleanup(self, rbce, bodybuf, headerbuf, headers); ext/curb_easy.c @@ -269,7 +269,7 @@ static VALUE ruby_curl_multi_perform(VALUE self) { tv.tv_sec = timeout / 1000; tv.tv_usec = (timeout * 1000) % 1000000; - rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv); + rc = rb_thread_select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv); if (rc < 0) { rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno)); } ext/curb_multi.c @@ -86,7 +86,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase def test_get_01 c = Curl::Easy.new($TEST_URL) - assert_equal true, c.http_get + assert_equal true, c.http_get assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str) assert_equal "", c.header_str end tests/tc_curl_easy.rb 350157aca0b1395a5a30229cfa5d824e79a3fb1e Todd A. Fisher taf2@web3.anerian.com http://github.com/taf2/curb/commit/8f46873c2018d29287846986aec14425385587b1 8f46873c2018d29287846986aec14425385587b1 2008-08-04T19:13:48-07:00 2008-08-04T19:13:48-07:00 use rb_thread_select, instead of native select, this allows ruby threads to schedule while curl is idle on network transfers d5db0998a471a391667bbafbb1b5c013d2b400c3 Todd A. Fisher taf2@web3.anerian.com