X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=2f59b59848b22c42bfec4b6b56a2e6914e2a3767;hp=27e1f0d819e819dd0fa363bcfd04131369397dbd;hb=9e37263154391dec762b839cad4b7dd13e35467e;hpb=6968eb8ac7ad68faefc1fc05b4d53389d004cf3c diff --git a/http_request_pool_api.c b/http_request_pool_api.c index 27e1f0d..2f59b59 100644 --- a/http_request_pool_api.c +++ b/http_request_pool_api.c @@ -13,6 +13,7 @@ /* $Id$ */ #define HTTP_WANT_CURL +#define HTTP_WANT_EVENT #include "php_http.h" #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) @@ -29,6 +30,18 @@ # define HTTP_DEBUG_REQPOOLS 0 #endif +#ifdef HTTP_HAVE_EVENT +typedef struct _http_request_pool_event_t { + struct event evnt; + http_request_pool *pool; +} http_request_pool_event; + +static inline void http_request_pool_update_timeout(http_request_pool *pool); +static void http_request_pool_timeout_callback(int socket, short action, void *event_data); +static void http_request_pool_event_callback(int socket, short action, void *event_data); +static int http_request_pool_socket_callback(CURL *easy, curl_socket_t s, int action, void *, void *); +#endif + static int http_request_pool_compare_handles(void *h1, void *h2); PHP_MINIT_FUNCTION(http_request_pool) @@ -39,6 +52,17 @@ PHP_MINIT_FUNCTION(http_request_pool) return SUCCESS; } +#ifdef HTTP_HAVE_EVENT +PHP_RINIT_FUNCTION(http_request_pool) +{ + if (!HTTP_G->request.pool.event.base && !(HTTP_G->request.pool.event.base = event_init())) { + 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) { @@ -59,7 +83,15 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool } return NULL; } - + + TSRMLS_SET_CTX(pool->tsrm_ls); + +#if HTTP_HAVE_EVENT + pool->timeout = ecalloc(1, sizeof(struct event)); + curl_multi_setopt(pool->ch, CURLMOPT_SOCKETDATA, pool); + curl_multi_setopt(pool->ch, CURLMOPT_SOCKETFUNCTION, http_request_pool_socket_callback); +#endif + 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); @@ -73,8 +105,9 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool /* }}} */ /* {{{ STATUS http_request_pool_attach(http_request_pool *, zval *) */ -PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request TSRMLS_DC) +PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request) { + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); getObjectEx(http_request_object, req, request); #if HTTP_DEBUG_REQPOOLS @@ -87,8 +120,19 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req 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)) { + + while (CURLM_CALL_MULTI_PERFORM == code) { +#ifdef HTTP_HAVE_EVENT + if (pool->useevents) { + code = curl_multi_socket_all(pool->ch, &pool->unfinished); + } else { +#endif + code = curl_multi_perform(pool->ch, &pool->unfinished); +#ifdef HTTP_HAVE_EVENT + } +#endif + } + if (CURLM_OK != 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; @@ -107,9 +151,10 @@ 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) +PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request) { CURLMcode code; + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); getObjectEx(http_request_object, req, request); #if HTTP_DEBUG_REQPOOLS @@ -143,7 +188,7 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req /* }}} */ /* {{{ 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) +PHP_HTTP_API void _http_request_pool_apply(http_request_pool *pool, http_request_pool_apply_func cb) { int count = zend_llist_count(&pool->handles); @@ -163,7 +208,7 @@ PHP_HTTP_API void _http_request_pool_apply(http_request_pool *pool, http_request } for (i = 0; i < count; ++i) { - if (cb(pool, handles[i] TSRMLS_CC)) { + if (cb(pool, handles[i])) { break; } } @@ -173,7 +218,7 @@ PHP_HTTP_API void _http_request_pool_apply(http_request_pool *pool, http_request /* }}} */ /* {{{ 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) +PHP_HTTP_API void _http_request_pool_apply_with_arg(http_request_pool *pool, http_request_pool_apply_with_arg_func cb, void *arg) { int count = zend_llist_count(&pool->handles); @@ -193,7 +238,7 @@ PHP_HTTP_API void _http_request_pool_apply_with_arg(http_request_pool *pool, htt } for (i = 0; i < count; ++i) { - if (cb(pool, handles[i], arg TSRMLS_CC)) { + if (cb(pool, handles[i], arg)) { break; } } @@ -203,7 +248,7 @@ PHP_HTTP_API void _http_request_pool_apply_with_arg(http_request_pool *pool, htt /* }}} */ /* {{{ void http_request_pool_detach_all(http_request_pool *) */ -PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC) +PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool) { #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "Detaching %d requests from pool %p\n", zend_llist_count(&pool->handles), pool); @@ -213,21 +258,33 @@ PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_D /* }}} */ /* {{{ STATUS http_request_pool_send(http_request_pool *) */ -PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC) +PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool) { + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); + #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 (SUCCESS != http_request_pool_select(pool)) { +#ifdef HTTP_HAVE_EVENT + if (pool->useevents) { + while (CURLM_CALL_MULTI_PERFORM == curl_multi_socket_all(pool->ch, &pool->unfinished)); + http_request_pool_update_timeout(pool); + + event_base_dispatch(HTTP_G->request.pool.event.base); + } else +#endif + { + 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 */ - http_error_ex(HE_WARNING, HTTP_E_SOCKET, "WinSock error: %d", 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)); + http_error(HE_WARNING, HTTP_E_SOCKET, strerror(errno)); #endif - return FAILURE; + return FAILURE; + } } } @@ -240,12 +297,18 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC) /* }}} */ /* {{{ void http_request_pool_dtor(http_request_pool *) */ -PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC) +PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool) { + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); + #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "Destructing request pool %p\n", pool); #endif +#if HTTP_HAVE_EVENT + efree(pool->timeout); +#endif + pool->unfinished = 0; zend_llist_clean(&pool->finished); zend_llist_clean(&pool->handles); @@ -264,16 +327,18 @@ 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; + struct timeval timeout; + +#ifdef HTTP_HAVE_EVENT + if (pool->useevents) { + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); + http_error(HE_WARNING, HTTP_E_RUNTIME, "not implemented; use HttpRequest callbacks"); + return FAILURE; } #endif - + + http_request_pool_timeout(pool, &timeout); + FD_ZERO(&R); FD_ZERO(&W); FD_ZERO(&E); @@ -291,31 +356,54 @@ 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 TSRMLS_DC) +PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool) { - CURLMsg *msg; - int remaining = 0; + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); + +#ifdef HTTP_HAVE_EVENT + if (pool->useevents) { + http_error(HE_WARNING, HTTP_E_RUNTIME, "not implemented; use HttpRequest callbacks"); + return FAILURE; + } +#endif while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished)); - while ((msg = curl_multi_info_read(pool->ch, &remaining))) { - if (CURLMSG_DONE == msg->msg) { - 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 HTTP_DEBUG_REQPOOLS + fprintf(stderr, "%u unfinished requests of pool %p remaining\n", pool->unfinished, pool); +#endif + + http_request_pool_responsehandler(pool); return pool->unfinished; } /* }}} */ -/* {{{ 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) +/* {{{ void http_request_pool_responsehandler(http_request_pool *) */ +void _http_request_pool_responsehandler(http_request_pool *pool) +{ + CURLMsg *msg; + int remaining = 0; + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); + + do { + msg = curl_multi_info_read(pool->ch, &remaining); + if (msg && CURLMSG_DONE == msg->msg) { + 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_apply_responsehandler, msg->easy_handle); + } + } while (remaining); +} +/* }}} */ + +/* {{{ int http_request_pool_apply_responsehandler(http_request_pool *, zval *, void *) */ +int _http_request_pool_apply_responsehandler(http_request_pool *pool, zval *req, void *ch) { + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); getObjectEx(http_request_object, obj, req); if ((!ch) || obj->request->ch == (CURL *) ch) { @@ -333,6 +421,31 @@ int _http_request_pool_responsehandler(http_request_pool *pool, zval *req, void } /* }}} */ +/* {{{ struct timeval *_http_request_pool_timeout(http_request_pool *, struct timeval *) */ +struct timeval *_http_request_pool_timeout(http_request_pool *pool, struct timeval *timeout) +{ +#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; + } else { +#endif + timeout->tv_sec = 1; + timeout->tv_usec = 0; +#ifdef HAVE_CURL_MULTI_TIMEOUT + } +#endif + +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Calculating timeout (%lu, %lu) of pool %p\n", (ulong) timeout->tv_sec, (ulong) timeout->tv_usec, pool); +#endif + + return timeout; +} +/* }}} */ + /*#*/ /* {{{ static int http_request_pool_compare_handles(void *, void *) */ @@ -342,6 +455,160 @@ static int http_request_pool_compare_handles(void *h1, void *h2) } /* }}} */ +#ifdef HTTP_HAVE_EVENT +/* {{{ static void http_request_pool_update_timeout(http_request_pool *) */ +static inline void http_request_pool_update_timeout(http_request_pool *pool) +{ + struct timeval timeout; + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); + + if (event_initialized(pool->timeout)) { + event_del(pool->timeout); + } + + if (pool->unfinished) { + event_set(pool->timeout, -1, 0, http_request_pool_timeout_callback, pool); + event_base_set(HTTP_G->request.pool.event.base, pool->timeout); + event_add(pool->timeout, http_request_pool_timeout(pool, &timeout)); + +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Updating timeout (%lu, %lu) of pool %p\n", (ulong) timeout.tv_sec, (ulong) timeout.tv_usec, pool); +#endif + } +#if HTTP_DEBUG_REQPOOLS + else fprintf(stderr, "Removed timeout of pool %p\n", pool); +#endif +} +/* }}} */ + +/* {{{ static void http_request_pool_timeout_callback(int, short, void *) */ +static void http_request_pool_timeout_callback(int socket, short action, void *event_data) +{ + CURLMcode rc; + http_request_pool *pool = event_data; + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); + +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Timeout occurred of pool %p\n", pool); +#endif + + while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket(pool->ch, CURL_SOCKET_TIMEOUT, &pool->unfinished))); + + if (CURLM_OK != rc) { + http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc)); + } + + http_request_pool_update_timeout(pool); +} +/* }}} */ + +/* {{{ static void http_request_pool_event_callback(int, short, void *) */ +static void http_request_pool_event_callback(int socket, short action, void *event_data) +{ + CURLMcode rc = CURLE_OK; + http_request_pool_event *ev = event_data; + http_request_pool *pool = ev->pool; + TSRMLS_FETCH_FROM_CTX(ev->pool->tsrm_ls); + +#if HTTP_DEBUG_REQPOOLS + { + static const char event_strings[][20] = {"NONE","TIMEOUT","READ","TIMEOUT|READ","WRITE","TIMEOUT|WRITE","READ|WRITE","TIMEOUT|READ|WRITE","SIGNAL"}; + fprintf(stderr, "Event on socket %d (%s) event %p of pool %p\n", socket, event_strings[action], ev, pool); + } +#endif + + /* don't use 'ev' below this loop as it might 've been freed in the socket callback */ + do { +#ifdef HAVE_CURL_MULTI_SOCKET_ACTION + switch (action & (EV_READ|EV_WRITE)) { + case EV_READ: + rc = curl_multi_socket_action(pool->ch, socket, CURL_CSELECT_IN, &pool->unfinished); + break; + case EV_WRITE: + rc = curl_multi_socket_action(pool->ch, socket, CURL_CSELECT_OUT, &pool->unfinished); + break; + case EV_READ|EV_WRITE: + rc = curl_multi_socket_action(pool->chm socket, CURL_CSELECT_IN|CURL_CSELECT_OUT, &pool->unfinished); + break; + default: + http_error(HE_WARNING, HTTP_E_SOCKET, "Unknown event %d", (int) action); + return; + } +#else + rc = curl_multi_socket(pool->ch, socket, &pool->unfinished); +#endif + } while (CURLM_CALL_MULTI_PERFORM == rc); + +#if HTTP_DEBUG_REQPOOLS + fprintf(stderr, "%u unfinished requests of pool %p remaining\n", pool->unfinished, pool); +#endif + + if (CURLM_OK != rc) { + http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc)); + } + + http_request_pool_responsehandler(pool); + http_request_pool_update_timeout(pool); +} +/* }}} */ + +/* {{{ static int http_request_pool_socket_callback(CURL *, curl_socket_t, int, void *, void *) */ +static int http_request_pool_socket_callback(CURL *easy, curl_socket_t sock, int action, void *socket_data, void *assign_data) +{ + int events = EV_PERSIST; + http_request_pool *pool = socket_data; + http_request_pool_event *ev = assign_data; + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); + + if (!ev) { + ev = ecalloc(1, sizeof(http_request_pool_event)); + ev->pool = pool; + curl_multi_assign(pool->ch, sock, ev); + fprintf(stderr, "+%2d\n", sock); + } else { + event_del(&ev->evnt); + fprintf(stderr, "-%2d\n", sock); + } + +#if HTTP_DEBUG_REQPOOLS + { + static const char action_strings[][8] = {"NONE", "IN", "OUT", "INOUT", "REMOVE"}; + http_request *r; + curl_easy_getinfo(easy, CURLINFO_PRIVATE, &r); + fprintf(stderr, "Callback on socket %d (%s) event %p of pool %p (%s)\n", (int) sock, action_strings[action], ev, pool, r->url); + } +#endif + + switch (action) { + case CURL_POLL_IN: + events |= EV_READ; + break; + case CURL_POLL_OUT: + events |= EV_WRITE; + break; + case CURL_POLL_INOUT: + events |= EV_READ|EV_WRITE; + break; + + case CURL_POLL_REMOVE: + efree(ev); + case CURL_POLL_NONE: + return 0; + + default: + http_error_ex(HE_WARNING, HTTP_E_SOCKET, "Unknown socket action %d", action); + return -1; + } + + event_set(&ev->evnt, sock, events, http_request_pool_event_callback, ev); + event_base_set(HTTP_G->request.pool.event.base, &ev->evnt); + event_add(&ev->evnt, NULL); + + return 0; +} +/* }}} */ +#endif /* HTTP_HAVE_EVENT */ + #endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */