From: Michael Wallner Date: Sun, 28 Jan 2007 10:49:47 +0000 (+0000) Subject: - persistent handles for curl_share and curl_multi X-Git-Tag: RELEASE_1_5_0_RC1~20 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=42dd649e29ed164437f98039ed58fa5fdd5fb2c9;p=m6w6%2Fext-http - persistent handles for curl_share and curl_multi --- diff --git a/http.c b/http.c index eccffd8..fc7f15a 100644 --- a/http.c +++ b/http.c @@ -31,6 +31,7 @@ #include "php_http_request_method_api.h" #ifdef HTTP_HAVE_CURL # include "php_http_request_api.h" +# include "php_http_request_pool_api.h" # include "php_http_request_datashare_api.h" # ifdef HTTP_HAVE_PERSISTENT_HANDLES # include "php_http_persistent_handle_api.h" @@ -289,6 +290,7 @@ PHP_MINIT_FUNCTION(http) #ifdef HTTP_HAVE_CURL # ifdef HTTP_HAVE_PERSISTENT_HANDLES (SUCCESS != PHP_MINIT_CALL(http_persistent_handle)) || + (SUCCESS != PHP_MINIT_CALL(http_request_pool)) || # endif (SUCCESS != PHP_MINIT_CALL(http_request)) || # ifdef ZEND_ENGINE_2 diff --git a/http_request_datashare_api.c b/http_request_datashare_api.c index 013ecac..0e7dbf6 100644 --- a/http_request_datashare_api.c +++ b/http_request_datashare_api.c @@ -21,6 +21,9 @@ #include "php_http_request_datashare_api.h" #include "php_http_request_api.h" #include "php_http_request_object.h" +#ifdef HTTP_HAVE_PERSISTENT_HANDLES +# include "php_http_persistent_handle_api.h" +#endif #ifndef HAVE_CURL_SHARE_STRERROR # define curl_share_strerror(dummy) "unknown error" @@ -29,6 +32,14 @@ # define curl_easy_strerror(dummy) "unknown error" #endif +#ifdef HTTP_HAVE_PERSISTENT_HANDLES +# define HTTP_CURL_SHARE_CTOR(ch) (SUCCESS == http_persistent_handle_acquire("http_request_datashare", &(ch))) +# define HTTP_CURL_SHARE_DTOR(chp) http_persistent_handle_release("http_request_datashare", (chp)) +#else +# define HTTP_CURL_SHARE_CTOR(ch) ((ch) = curl_share_init()) +# define HTTP_CURL_SHARE_DTOR(chp) curl_share_cleanup(*(chp)); *(chp) = NULL +#endif + static HashTable http_request_datashare_options; static http_request_datashare http_request_datashare_global; static int http_request_datashare_compare_handles(void *h1, void *h2); @@ -47,6 +58,16 @@ PHP_MINIT_FUNCTION(http_request_datashare) { curl_lock_data val; +#ifdef HTTP_HAVE_PERSISTENT_HANDLES + if (SUCCESS != http_persistent_handle_provide("http_request_datashare", curl_share_init, (http_persistent_handle_dtor) curl_share_cleanup)) { + return FAILURE; + } +#endif + + if (!http_request_datashare_init_ex(&http_request_datashare_global, 1)) { + return FAILURE; + } + zend_hash_init(&http_request_datashare_options, 4, NULL, NULL, 1); #define ADD_DATASHARE_OPT(name, opt) \ val = opt; \ @@ -56,8 +77,6 @@ PHP_MINIT_FUNCTION(http_request_datashare) ADD_DATASHARE_OPT("ssl", CURL_LOCK_DATA_SSL_SESSION); ADD_DATASHARE_OPT("connect", CURL_LOCK_DATA_CONNECT); - http_request_datashare_init_ex(&http_request_datashare_global, 1); - return SUCCESS; } @@ -92,8 +111,7 @@ PHP_HTTP_API http_request_datashare *_http_request_datashare_init_ex(http_reques } memset(share, 0, sizeof(http_request_datashare)); - HTTP_CHECK_CURL_INIT(share->ch, curl_share_init(), ;); - if (!share->ch) { + if (!HTTP_CURL_SHARE_CTOR(share->ch)) { if (free_share) { pefree(share, persistent); } @@ -180,7 +198,7 @@ PHP_HTTP_API void _http_request_datashare_dtor(http_request_datashare *share TSR zend_llist_destroy(share->handles); efree(share->handles); } - curl_share_cleanup(share->ch); + HTTP_CURL_SHARE_DTOR(&share->ch); #ifdef ZTS if (share->persistent) { int i; diff --git a/http_request_pool_api.c b/http_request_pool_api.c index 1541614..29df94f 100644 --- a/http_request_pool_api.c +++ b/http_request_pool_api.c @@ -23,6 +23,7 @@ #include "php_http_request_object.h" #include "php_http_request_pool_api.h" #include "php_http_requestpool_object.h" +#include "php_http_persistent_handle_api.h" #ifndef HTTP_DEBUG_REQPOOLS # define HTTP_DEBUG_REQPOOLS 0 @@ -32,8 +33,26 @@ # define curl_multi_strerror(dummy) "unknown error" #endif +#ifdef HTTP_HAVE_PERSISTENT_HANDLES +# define HTTP_CURL_MULTI_CTOR(ch) (SUCCESS == http_persistent_handle_acquire("http_request_pool", &(ch))) +# define HTTP_CURL_MULTI_DTOR(chp) http_persistent_handle_release("http_request_pool", (chp)) +#else +# define HTTP_CURL_MULTI_CTOR(ch) ((ch) = curl_multi_init()) +# define HTTP_CURL_MULTI_DTOR(chp) curl_multi_cleanup(*(chp)); *(chp) = NULL +#endif + static int http_request_pool_compare_handles(void *h1, void *h2); +#ifdef HTTP_HAVE_PERSISTENT_HANDLES +PHP_MINIT_FUNCTION(http_request_pool) +{ + if (SUCCESS != http_persistent_handle_provide("http_request_pool", curl_multi_init, (http_persistent_handle_dtor) curl_multi_cleanup)) { + return FAILURE; + } + return SUCCESS; +} +#endif + /* {{{ http_request_pool *http_request_pool_init(http_request_pool *) */ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC) { @@ -48,8 +67,7 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool pool->ch = NULL; } - HTTP_CHECK_CURL_INIT(pool->ch, curl_multi_init(), ;); - if (!pool->ch) { + if (!HTTP_CURL_MULTI_CTOR(pool->ch)) { if (free_pool) { efree(pool); } @@ -245,7 +263,7 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC) pool->unfinished = 0; zend_llist_clean(&pool->finished); zend_llist_clean(&pool->handles); - curl_multi_cleanup(pool->ch); + HTTP_CURL_MULTI_DTOR(&pool->ch); } /* }}} */ diff --git a/package2.xml b/package2.xml index 12bcc97..f90f022 100644 --- a/package2.xml +++ b/package2.xml @@ -40,7 +40,8 @@ support. Parallel requests are available for PHP 5 and greater. BSD, revised diff --git a/php_http_request_pool_api.h b/php_http_request_pool_api.h index aff9c1e..8477255 100644 --- a/php_http_request_pool_api.h +++ b/php_http_request_pool_api.h @@ -26,6 +26,10 @@ typedef struct _http_request_pool_t { typedef int (*http_request_pool_apply_func)(http_request_pool *pool, zval *request TSRMLS_DC); typedef int (*http_request_pool_apply_with_arg_func)(http_request_pool *pool, zval *request, void *arg TSRMLS_DC); +#ifdef HTTP_HAVE_PERSISTENT_HANDLES +PHP_MINIT_FUNCTION(http_request_pool); +#endif + #define http_request_pool_responsehandler(p, r, c) _http_request_pool_responsehandler((p), (r), (c) TSRMLS_CC) extern int _http_request_pool_responsehandler(http_request_pool *pool, zval *req, void *ch TSRMLS_DC);