X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=cf8421848b4a55ae6f0eabde2361d8d27938f131;hp=64224fe5df87217a7a341bf4da62e9372e19240a;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=a7c9ca5fe4922c1064b3397b61eca6d83cea6cfa diff --git a/http_request_pool_api.c b/http_request_pool_api.c index 64224fe..cf84218 100644 --- a/http_request_pool_api.c +++ b/http_request_pool_api.c @@ -1,76 +1,69 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2006, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif -#include "php.h" +#define HTTP_WANT_CURL +#include "php_http.h" #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) -#include "php_http.h" -#include "php_http_std_defs.h" #include "php_http_api.h" +#include "php_http_exception_object.h" #include "php_http_request_api.h" -#include "php_http_request_pool_api.h" #include "php_http_request_object.h" +#include "php_http_request_pool_api.h" #include "php_http_requestpool_object.h" #ifndef HTTP_DEBUG_REQPOOLS # define HTTP_DEBUG_REQPOOLS 0 #endif -ZEND_EXTERN_MODULE_GLOBALS(http); - #ifndef HAVE_CURL_MULTI_STRERROR # define curl_multi_strerror(dummy) "unknown error" #endif -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 *) */ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC) { zend_bool free_pool; + #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "Initializing request pool %p\n", pool); #endif + if ((free_pool = (!pool))) { pool = emalloc(sizeof(http_request_pool)); pool->ch = NULL; } + HTTP_CHECK_CURL_INIT(pool->ch, curl_multi_init(), ;); if (!pool->ch) { - if (!(pool->ch = curl_multi_init())) { - http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initialize curl"); - if (free_pool) { - efree(pool); - } - return NULL; + if (free_pool) { + efree(pool); } + return NULL; } 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); #endif + return pool; } /* }}} */ @@ -79,38 +72,31 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request TSRMLS_DC) { getObjectEx(http_request_object, req, request); + #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "Attaching HttpRequest(#%d) %p to pool %p\n", Z_OBJ_HANDLE_P(request), req, pool); #endif + 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"); } 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 to the HttpRequestPool: %s", 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_add_ref(&request); - zend_objects_store_add_ref(request TSRMLS_CC); + 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; } @@ -119,10 +105,13 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req /* {{{ STATUS http_request_pool_detach(http_request_pool *, zval *) */ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC) { + CURLMcode code; getObjectEx(http_request_object, req, request); + #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "Detaching HttpRequest(#%d) %p from pool %p\n", Z_OBJ_HANDLE_P(request), req, pool); #endif + if (!req->pool) { /* not attached to any pool */ #if HTTP_DEBUG_REQPOOLS @@ -130,19 +119,18 @@ 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->request->ch))) { + http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code)); } else { - CURLMcode code; - req->pool = NULL; + zend_llist_del_element(&pool->finished, request, http_request_pool_compare_handles); zend_llist_del_element(&pool->handles, request, http_request_pool_compare_handles); + #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "> %d HttpRequests remaining in pool %p\n", zend_llist_count(&pool->handles), pool); #endif - 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 { - return SUCCESS; - } + + return SUCCESS; } return FAILURE; } @@ -152,9 +140,11 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool 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 -- @@ -168,34 +158,28 @@ PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_D 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) { http_request_pool_detach(pool, handles[i]); } efree(handles); } -#if HTTP_DEBUG_REQPOOLS - fprintf(srderr, "Destroying %d request bodies of pool %p\n", zend_llist_count(&pool->bodies), pool); -#endif - /* free created bodies too */ - zend_llist_clean(&pool->bodies); } - /* {{{ STATUS http_request_pool_send(http_request_pool *) */ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC) { #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "Attempt to send %d requests of pool %p\n", zend_llist_count(&pool->handles), pool); #endif + while (http_request_pool_perform(pool)) { -#if HTTP_DEBUG_REQPOOLS - fprintf(stderr, "> %d unfinished requests of pool %p remaining\n", pool->unfinished, pool); -#endif if (SUCCESS != http_request_pool_select(pool)) { #ifdef PHP_WIN32 http_error(HE_WARNING, HTTP_E_SOCKET, WSAGetLastError()); @@ -205,10 +189,11 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC) return FAILURE; } } + #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "Finished sending %d HttpRequests of pool %p (still unfinished: %d)\n", zend_llist_count(&pool->handles), pool, pool->unfinished); #endif - zend_llist_apply(&pool->handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC); + return SUCCESS; } /* }}} */ @@ -219,13 +204,20 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC) #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "Destructing request pool %p\n", pool); #endif + pool->unfinished = 0; + zend_llist_clean(&pool->finished); zend_llist_clean(&pool->handles); - zend_llist_clean(&pool->bodies); curl_multi_cleanup(pool->ch); } /* }}} */ +#ifdef PHP_WIN32 +# define SELECT_ERROR SOCKET_ERROR +#else +# define SELECT_ERROR -1 +#endif + /* {{{ STATUS http_request_pool_select(http_request_pool *) */ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool) { @@ -237,61 +229,130 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool) FD_ZERO(&W); FD_ZERO(&E); - curl_multi_fdset(pool->ch, &R, &W, &E, &MAX); - return (-1 != select(MAX + 1, &R, &W, &E, &timeout)) ? SUCCESS : FAILURE; + if (CURLM_OK == curl_multi_fdset(pool->ch, &R, &W, &E, &MAX)) { + if (MAX == -1 || SELECT_ERROR != select(MAX + 1, &R, &W, &E, &timeout)) { + return SUCCESS; + } + } + return FAILURE; } /* }}} */ /* {{{ int http_request_pool_perform(http_request_pool *) */ -PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool) +PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC) { + CURLMsg *msg; + int remaining = 0; + while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished)); - 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; + + 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_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(); + } } - return FAILURE; + http_request_pool_final(); + + return pool->unfinished; } /* }}} */ /* {{{ void http_request_pool_responsehandler(zval **) */ -void _http_request_pool_responsehandler(zval **req TSRMLS_DC) +void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC) { getObjectEx(http_request_object, obj, *req); + + if (obj->request->ch == 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_PP(req), obj, obj->pool); #endif - http_request_object_responsehandler(obj, *req); + + ZVAL_ADDREF(*req); + zend_llist_add_element(&obj->pool->finished, req); + http_request_object_responsehandler(obj, *req); + } } /* }}} */ -/*#*/ - -/* {{{ static void http_request_pool_freebody(http_request_ctx **) */ -static void http_request_pool_freebody(http_request_callback_ctx **body) +static void move_backtrace_args(zval *from, zval *to TSRMLS_DC) { - HTTP_REQUEST_CALLBACK_DATA(*body, http_request_body *, b); - http_request_body_free(b); - efree(*body); + zval **args, **trace_0, *old_trace_0, *trace = NULL; + + if ((trace = zend_read_property(zend_exception_get_default(), from, "trace", lenof("trace"), 0 TSRMLS_CC))) { + if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) { + old_trace_0 = *trace_0; + if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(trace_0), "args", sizeof("args"), (void *) &args)) { + if ((trace = zend_read_property(zend_exception_get_default(), to, "trace", lenof("trace"), 0 TSRMLS_CC))) { + if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) { + ZVAL_ADDREF(*args); + add_assoc_zval(*trace_0, "args", *args); + zend_hash_del(Z_ARRVAL_P(old_trace_0), "args", sizeof("args")); + } + } + } + } + } +} +/* {{{ void http_request_pool_wrap_exception(zval *, zval *) */ +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 *old_exprop, *new_exprop; + + MAKE_STD_ZVAL(new_exprop); + array_init(new_exprop); + old_exprop = zend_read_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), 0 TSRMLS_CC); + if (Z_TYPE_P(old_exprop) == IS_ARRAY) { + array_copy(old_exprop, new_exprop); + } + add_next_index_zval(new_exprop, new_exception); + zend_update_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), new_exprop TSRMLS_CC); + zval_ptr_dtor(&new_exprop); + + 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); + } + move_backtrace_args(new_exception, exval TSRMLS_CC); + zend_update_property_long(ce, exval, "code", lenof("code"), HTTP_E_REQUEST_POOL TSRMLS_CC); + zend_update_property_string(ce, exval, "message", lenof("message"), "See exceptionStack property" TSRMLS_CC); + add_next_index_zval(exprop, new_exception); + zend_update_property(ce, exval, "exceptionStack", lenof("exceptionStack"), exprop TSRMLS_CC); + zval_ptr_dtor(&exprop); + + EG(exception) = exval; + } } /* }}} */ +/*#*/ + /* {{{ static int http_request_pool_compare_handles(void *, void *) */ static int http_request_pool_compare_handles(void *h1, void *h2) { - int match = (Z_OBJ_HANDLE_PP((zval **) h1) == Z_OBJ_HANDLE_P((zval *) h2)); -#if HTTP_DEBUG_REQPOOLS - /* if(match) fprintf(stderr, "OK\n"); */ -#endif - return match; + return (Z_OBJ_HANDLE_PP((zval **) h1) == Z_OBJ_HANDLE_P((zval *) h2)); } /* }}} */