X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=154161404a4f3d0cb8f9c6cf9f1df4770ff6c59f;hp=33a498c89a91155ca3683d7285e791206af2228e;hb=b23b4edaebd71ff76579b97f3ee353f43e83bd25;hpb=63ae3bdd3dc28be356bb0680a16bce2090b7847b diff --git a/http_request_pool_api.c b/http_request_pool_api.c index 33a498c..1541614 100644 --- a/http_request_pool_api.c +++ b/http_request_pool_api.c @@ -6,16 +6,12 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #define HTTP_WANT_CURL #include "php_http.h" @@ -32,15 +28,10 @@ # define HTTP_DEBUG_REQPOOLS 0 #endif -ZEND_EXTERN_MODULE_GLOBALS(http); - #ifndef HAVE_CURL_MULTI_STRERROR # define curl_multi_strerror(dummy) "unknown error" #endif -#define http_request_pool_wrap_exception(o, n) _http_request_pool_wrap_exception((o), (n) TSRMLS_CC) -static inline void _http_request_pool_wrap_exception(zval *old_exception, zval *new_exception TSRMLS_DC); -static void http_request_pool_freebody(http_request_callback_ctx **body); static int http_request_pool_compare_handles(void *h1, void *h2); /* {{{ http_request_pool *http_request_pool_init(http_request_pool *) */ @@ -68,7 +59,6 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool pool->unfinished = 0; zend_llist_init(&pool->finished, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0); zend_llist_init(&pool->handles, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0); - zend_llist_init(&pool->bodies, sizeof(http_request_callback_ctx *), (llist_dtor_func_t) http_request_pool_freebody, 0); #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "Initialized request pool %p\n", pool); @@ -89,32 +79,24 @@ 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(#%d) for attaching to the HttpRequestPool", Z_OBJ_HANDLE_P(request)); } else { - http_request_callback_ctx *body = http_request_callback_data_ex(http_request_body_new(), 0); + CURLMcode code = curl_multi_add_handle(pool->ch, req->request->ch); - if (SUCCESS != http_request_pool_requesthandler(request, body->data)) { - http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not initialize HttpRequest object for attaching to the HttpRequestPool"); + if ((CURLM_OK != code) && (CURLM_CALL_MULTI_PERFORM != 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 { - CURLMcode code = curl_multi_add_handle(pool->ch, req->ch); + req->pool = pool; - 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)); - } else { - req->pool = pool; - - zend_llist_add_element(&pool->handles, &request); - zend_llist_add_element(&pool->bodies, &body); - - ZVAL_ADDREF(request); + ZVAL_ADDREF(request); + zend_llist_add_element(&pool->handles, &request); #if HTTP_DEBUG_REQPOOLS - fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool); + fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool); #endif - return SUCCESS; - } + return SUCCESS; } - efree(body->data); - efree(body); } return FAILURE; } @@ -137,8 +119,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 (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->ch))) { - http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code)); + } 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(#%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); @@ -154,20 +138,11 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req } /* }}} */ -/* {{{ void http_request_pool_detach_all(http_request_pool *) */ -PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC) +/* {{{ void http_request_pool_apply(http_request_pool *, http_request_pool_apply_func) */ +PHP_HTTP_API void _http_request_pool_apply(http_request_pool *pool, http_request_pool_apply_func cb TSRMLS_DC) { int count = zend_llist_count(&pool->handles); -#if HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Detaching %d requests from pool %p\n", count, pool); -#endif - - /* - * we cannot apply a function to the llist which actually detaches - * the curl handle *and* removes the llist element -- - * so let's get our hands dirty - */ if (count) { int i = 0; zend_llist_position pos; @@ -184,18 +159,54 @@ PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_D } for (i = 0; i < count; ++i) { - http_request_pool_detach(pool, handles[i]); + if (cb(pool, handles[i] TSRMLS_CC)) { + break; + } } efree(handles); } +} +/* }}} */ + +/* {{{ void http_request_pool_apply_with_arg(http_request_pool *, http_request_pool_apply_with_arg_func, void *) */ +PHP_HTTP_API void _http_request_pool_apply_with_arg(http_request_pool *pool, http_request_pool_apply_with_arg_func cb, void *arg TSRMLS_DC) +{ + int count = zend_llist_count(&pool->handles); + if (count) { + int i = 0; + zend_llist_position pos; + zval **handle, **handles = emalloc(count * sizeof(zval *)); + + for (handle = zend_llist_get_first_ex(&pool->handles, &pos); handle; handle = zend_llist_get_next_ex(&pool->handles, &pos)) { + handles[i++] = *handle; + } + + /* should never happen */ + if (i != count) { + zend_error(E_ERROR, "number of fetched request handles do not match overall count"); + count = i; + } + + for (i = 0; i < count; ++i) { + if (cb(pool, handles[i], arg TSRMLS_CC)) { + break; + } + } + efree(handles); + } +} +/* }}} */ + +/* {{{ void http_request_pool_detach_all(http_request_pool *) */ +PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC) +{ #if HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Destroying %d request bodies of pool %p\n", zend_llist_count(&pool->bodies), pool); + fprintf(stderr, "Detaching %d requests from pool %p\n", zend_llist_count(&pool->handles), pool); #endif - - /* free created bodies too */ - zend_llist_clean(&pool->bodies); + http_request_pool_apply(pool, _http_request_pool_detach); } +/* }}} */ /* {{{ STATUS http_request_pool_send(http_request_pool *) */ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC) @@ -207,7 +218,8 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC) while (http_request_pool_perform(pool)) { if (SUCCESS != http_request_pool_select(pool)) { #ifdef PHP_WIN32 - http_error(HE_WARNING, HTTP_E_SOCKET, WSAGetLastError()); + /* see http://msdn.microsoft.com/library/en-us/winsock/winsock/windows_sockets_error_codes_2.asp */ + http_error_ex(HE_WARNING, HTTP_E_SOCKET, "WinSock error: %d", WSAGetLastError()); #else http_error(HE_WARNING, HTTP_E_SOCKET, strerror(errno)); #endif @@ -233,7 +245,6 @@ 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); - zend_llist_clean(&pool->bodies); curl_multi_cleanup(pool->ch); } /* }}} */ @@ -250,13 +261,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; } } @@ -264,18 +286,6 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool) } /* }}} */ -#define http_request_pool_try \ - { \ - zval *old_exception = EG(exception); \ - EG(exception) = NULL; -#define http_request_pool_catch \ - if (EG(exception)) { \ - http_request_pool_wrap_exception(old_exception, EG(exception)); \ - } else { \ - EG(exception) = old_exception; \ - } \ - } - /* {{{ int http_request_pool_perform(http_request_pool *) */ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC) { @@ -286,109 +296,41 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC) 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_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(msg->data.result)); - } http_request_pool_catch; - } - http_request_pool_try { - zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_responsehandler, msg->easy_handle TSRMLS_CC); - } http_request_pool_catch; + if (CURLE_OK != msg->data.result) { + 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_apply_with_arg(pool, _http_request_pool_responsehandler, msg->easy_handle); } } - if (EG(exception)) { - zval *exception; - - http_request_pool_wrap_exception(NULL, EG(exception)); - - exception = EG(exception); - EG(exception) = NULL; - zend_throw_exception_object(exception TSRMLS_CC); - } return pool->unfinished; } /* }}} */ -/* {{{ STATUS http_request_pool_requesthandler(zval *, http_request_body *) */ -STATUS _http_request_pool_requesthandler(zval *request, http_request_body *body TSRMLS_DC) -{ - getObjectEx(http_request_object, req, request); - if (SUCCESS == http_request_object_requesthandler(req, request, body)) { - http_request_conv(req->ch, &req->response, &req->request); - return SUCCESS; - } - return FAILURE; -} -/* }}} */ - -/* {{{ void http_request_pool_responsehandler(zval **) */ -void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC) +/* {{{ void http_request_pool_responsehandler(http_request_pool *, zval *, void *) */ +int _http_request_pool_responsehandler(http_request_pool *pool, zval *req, void *ch TSRMLS_DC) { - getObjectEx(http_request_object, obj, *req); + getObjectEx(http_request_object, obj, req); - if (obj->ch == ch) { + if ((!ch) || obj->request->ch == (CURL *) ch) { #if HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_PP(req), obj, obj->pool); + fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_P(req), obj, obj->pool); #endif - ZVAL_ADDREF(*req); - zend_llist_add_element(&obj->pool->finished, req); - http_request_object_responsehandler(obj, *req); + ZVAL_ADDREF(req); + zend_llist_add_element(&obj->pool->finished, &req); + http_request_object_responsehandler(obj, req); + return 1; } + return 0; } /* }}} */ /*#*/ -/* {{{ static void http_request_pool_wrap_exception(zval *, zval *) */ -static inline void _http_request_pool_wrap_exception(zval *old_exception, zval *new_exception TSRMLS_DC) -{ - zend_class_entry *ce = HTTP_EX_CE(request_pool); - - /* if old_exception is already an HttpRequestPoolException append the new one, - else create a new HttpRequestPoolException and append the old and new exceptions */ - if (old_exception && Z_OBJCE_P(old_exception) == ce) { - zval *exprop; - - exprop = zend_read_property(ce, old_exception, "requestExceptions", sizeof("requestExceptions")-1, 0 TSRMLS_CC); - SEP_PROP(&exprop); - convert_to_array(exprop); - - add_next_index_zval(exprop, new_exception); - zend_update_property(ce, old_exception, "requestExceptions", sizeof("requestExceptions")-1, exprop TSRMLS_CC); - - EG(exception) = old_exception; - } else if (new_exception && Z_OBJCE_P(new_exception) != ce){ - zval *exval, *exprop; - - MAKE_STD_ZVAL(exval); - object_init_ex(exval, ce); - MAKE_STD_ZVAL(exprop); - array_init(exprop); - - if (old_exception) { - add_next_index_zval(exprop, old_exception); - } - add_next_index_zval(exprop, new_exception); - zend_update_property(ce, exval, "requestExceptions", sizeof("requestExceptions")-1, exprop TSRMLS_CC); - zval_ptr_dtor(&exprop); - - EG(exception) = exval; - } -} -/* }}} */ - -/* {{{ static void http_request_pool_freebody(http_request_ctx **) */ -static void http_request_pool_freebody(http_request_callback_ctx **body) -{ - HTTP_REQUEST_CALLBACK_DATA(*body, http_request_body *, b); - http_request_body_free(b); - efree(*body); -} -/* }}} */ - /* {{{ static int http_request_pool_compare_handles(void *, void *) */ static int http_request_pool_compare_handles(void *h1, void *h2) {