X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=48cf18c4a8cc76f1af29c3f59fb76eb055f6a161;hp=d8aae7c004f8c924a7bfb962ec7855f49cad760a;hb=f2d0dbf38d7b00455d3dfba8f2de087105ae0f35;hpb=f1df16d07b48a2561ec8c3065e094f3f17c09889 diff --git a/http_request_pool_api.c b/http_request_pool_api.c index d8aae7c..48cf18c 100644 --- a/http_request_pool_api.c +++ b/http_request_pool_api.c @@ -1,16 +1,13 @@ /* - +----------------------------------------------------------------------+ - | 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-2005, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ @@ -18,16 +15,17 @@ #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 @@ -105,8 +103,7 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req zend_llist_add_element(&pool->handles, &request); zend_llist_add_element(&pool->bodies, &body); - zval_add_ref(&request); - Z_OBJ_ADDREF_P(request); + ZVAL_ADDREF(request); #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool); @@ -124,6 +121,7 @@ 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 @@ -137,22 +135,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->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->handles, request, http_request_pool_compare_handles); 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; } @@ -242,6 +236,12 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC) } /* }}} */ +#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) { @@ -253,8 +253,12 @@ 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; } /* }}} */ @@ -266,16 +270,19 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC) while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished)); - while (msg = curl_multi_info_read(pool->ch, &remaining)) { + while ((msg = curl_multi_info_read(pool->ch, &remaining))) { if (CURLMSG_DONE == msg->msg) { - -#if HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Done CURL handle: %p (remaining: %d)\n", msg->easy_handle, remaining); -#endif - - zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_responsehandler, msg->easy_handle TSRMLS_CC); + 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(); } } + http_request_pool_final(); return pool->unfinished; } @@ -304,14 +311,73 @@ void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC) fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_PP(req), obj, obj->pool); #endif - zval_add_ref(req); - Z_OBJ_ADDREF_PP(req); + ZVAL_ADDREF(*req); zend_llist_add_element(&obj->pool->finished, req); http_request_object_responsehandler(obj, *req); } } /* }}} */ +static void move_backtrace_args(zval *from, zval *to TSRMLS_DC) +{ + 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 *exprop; + + exprop = zend_read_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), 0 TSRMLS_CC); + SEP_PROP(&exprop); + convert_to_array(exprop); + + add_next_index_zval(exprop, new_exception); + zend_update_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), 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); + } + 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 void http_request_pool_freebody(http_request_ctx **) */