X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=27e1f0d819e819dd0fa363bcfd04131369397dbd;hp=ae125259302939a74a3882147f23b185bd0ceaa1;hb=fee48a4d3353d6b37dfe0e40377ec0fe0c6e9a61;hpb=eae2e0b6f3ec09658c4e5ea54662a2221890fed7 diff --git a/http_request_pool_api.c b/http_request_pool_api.c index ae12525..27e1f0d 100644 --- a/http_request_pool_api.c +++ b/http_request_pool_api.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2006, Michael Wallner | + | Copyright (c) 2004-2007, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -19,6 +19,7 @@ #include "php_http_api.h" #include "php_http_exception_object.h" +#include "php_http_persistent_handle_api.h" #include "php_http_request_api.h" #include "php_http_request_object.h" #include "php_http_request_pool_api.h" @@ -28,12 +29,16 @@ # define HTTP_DEBUG_REQPOOLS 0 #endif -#ifndef HAVE_CURL_MULTI_STRERROR -# define curl_multi_strerror(dummy) "unknown error" -#endif - static int http_request_pool_compare_handles(void *h1, void *h2); +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, NULL)) { + return FAILURE; + } + return SUCCESS; +} + /* {{{ 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 +53,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 (SUCCESS != http_persistent_handle_acquire("http_request_pool", &pool->ch)) { if (free_pool) { efree(pool); } @@ -80,12 +84,12 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req if (req->pool) { http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is already member of %s HttpRequestPool", Z_OBJ_HANDLE_P(request), req->pool == pool ? "this" : "another"); } else if (SUCCESS != http_request_object_requesthandler(req, request)) { - http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not initialize HttpRequest object for attaching to the HttpRequestPool"); + http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not initialize HttpRequest object(#%d) for attaching to the HttpRequestPool", Z_OBJ_HANDLE_P(request)); } else { CURLMcode code = curl_multi_add_handle(pool->ch, req->request->ch); if ((CURLM_OK != code) && (CURLM_CALL_MULTI_PERFORM != code)) { - http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code)); + http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not attach HttpRequest object(#%d) to the HttpRequestPool: %s", Z_OBJ_HANDLE_P(request), curl_multi_strerror(code)); } else { req->pool = pool; @@ -119,8 +123,10 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req #endif } else if (req->pool != pool) { http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is not attached to this HttpRequestPool", Z_OBJ_HANDLE_P(request)); + } else if (req->request->_in_progress_cb) { + http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "HttpRequest object(#%d) cannot be detached from the HttpRequestPool while executing the progress callback", Z_OBJ_HANDLE_P(request)); } else if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->request->ch))) { - http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code)); + http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object(#%d) from the HttpRequestPool: %s", Z_OBJ_HANDLE_P(request), curl_multi_strerror(code)); } else { req->pool = NULL; zend_llist_del_element(&pool->finished, request, http_request_pool_compare_handles); @@ -213,7 +219,7 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC) fprintf(stderr, "Attempt to send %d requests of pool %p\n", zend_llist_count(&pool->handles), pool); #endif - while (http_request_pool_perform(pool, 0)) { + while (http_request_pool_perform(pool)) { if (SUCCESS != http_request_pool_select(pool)) { #ifdef PHP_WIN32 /* see http://msdn.microsoft.com/library/en-us/winsock/winsock/windows_sockets_error_codes_2.asp */ @@ -243,7 +249,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_persistent_handle_release("http_request_pool", &pool->ch); } /* }}} */ @@ -259,13 +265,24 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool) int MAX; fd_set R, W, E; struct timeval timeout = {1, 0}; +#ifdef HAVE_CURL_MULTI_TIMEOUT + long max_tout = 1000; + + if ((CURLM_OK == curl_multi_timeout(pool->ch, &max_tout)) && (max_tout != -1)) { + timeout.tv_sec = max_tout / 1000; + timeout.tv_usec = (max_tout % 1000) * 1000; + } +#endif FD_ZERO(&R); FD_ZERO(&W); FD_ZERO(&E); if (CURLM_OK == curl_multi_fdset(pool->ch, &R, &W, &E, &MAX)) { - if (MAX == -1 || SELECT_ERROR != select(MAX + 1, &R, &W, &E, &timeout)) { + if (MAX == -1) { + http_sleep((double) timeout.tv_sec + (double) (timeout.tv_usec / HTTP_MCROSEC)); + return SUCCESS; + } else if (SELECT_ERROR != select(MAX + 1, &R, &W, &E, &timeout)) { return SUCCESS; } } @@ -274,7 +291,7 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool) /* }}} */ /* {{{ int http_request_pool_perform(http_request_pool *) */ -PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool, int once TSRMLS_DC) +PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC) { CURLMsg *msg; int remaining = 0; @@ -284,20 +301,13 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool, int once TS while ((msg = curl_multi_info_read(pool->ch, &remaining))) { if (CURLMSG_DONE == msg->msg) { if (CURLE_OK != msg->data.result) { - http_request_pool_try { - http_request *r = NULL; - curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &r); - http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(msg->data.result), r?r->_error:"", r?r->url:""); - } http_request_pool_catch(); + http_request *r = NULL; + curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &r); + http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(msg->data.result), r?r->_error:"", r?r->url:""); } - http_request_pool_try { - http_request_pool_apply_with_arg(pool, _http_request_pool_responsehandler, msg->easy_handle); - } http_request_pool_catch(); + http_request_pool_apply_with_arg(pool, _http_request_pool_responsehandler, msg->easy_handle); } } - if (once || !pool->unfinished) { - http_request_pool_final(); - } return pool->unfinished; }