X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_pool.c;h=7e3e1b802942d80e7f7cf25bc83cef4f4e7a4928;hp=4be111105a1d96aab78f0d8e1c983d1307a078bd;hb=50546d76a9bf44bba6237df7c8101be125bc929a;hpb=6a38ef90aa81f5bf71dcb2477fab541e5e8dc94a diff --git a/php_http_request_pool.c b/php_http_request_pool.c index 4be1111..7e3e1b8 100644 --- a/php_http_request_pool.c +++ b/php_http_request_pool.c @@ -1,579 +1,203 @@ #include "php_http.h" -#ifdef PHP_HTTP_HAVE_EVENT -# include -#endif - -#include #include +#include -#ifndef PHP_HTTP_DEBUG_REQPOOLS -# define PHP_HTTP_DEBUG_REQPOOLS 0 -#endif - -#ifdef PHP_HTTP_HAVE_EVENT -typedef struct php_http_request_pool_event { - struct event evnt; - php_http_request_pool_t *pool; -} php_http_request_pool_event_t; - -static void php_http_request_pool_timeout_callback(int socket, short action, void *event_data); -static void php_http_request_pool_event_callback(int socket, short action, void *event_data); -static int php_http_request_pool_socket_callback(CURL *easy, curl_socket_t s, int action, void *, void *); -static void php_http_request_pool_timer_callback(CURLM *multi, long timeout_ms, void *timer_data); -#endif - -static int php_http_request_pool_compare_handles(void *h1, void *h2); - -PHP_HTTP_API php_http_request_pool_t *php_http_request_pool_init(php_http_request_pool_t *pool TSRMLS_DC) +PHP_HTTP_API php_http_request_pool_t *php_http_request_pool_init(php_http_request_pool_t *h, php_http_request_pool_ops_t *ops, php_http_resource_factory_t *rf, void *init_arg TSRMLS_DC) { - zend_bool free_pool; - -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Initializing request pool %p\n", pool); -#endif + php_http_request_pool_t *free_h = NULL; - if ((free_pool = (!pool))) { - pool = emalloc(sizeof(php_http_request_pool_t)); - pool->ch = NULL; + if (!h) { + free_h = h = emalloc(sizeof(*h)); } + memset(h, 0, sizeof(*h)); - if (SUCCESS != php_http_persistent_handle_acquire(ZEND_STRL("http_request_pool"), &pool->ch TSRMLS_CC)) { - if (free_pool) { - efree(pool); + h->ops = ops; + h->rf = rf ? rf : php_http_resource_factory_init(NULL, h->ops->rsrc, NULL, NULL); + zend_llist_init(&h->requests.attached, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0); + zend_llist_init(&h->requests.finished, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0); + TSRMLS_SET_CTX(h->ts); + + if (h->ops->init) { + if (!(h = h->ops->init(h, init_arg))) { + php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST_POOL, "Could not initialize request pool"); + if (free_h) { + efree(h); + } } - return NULL; } - TSRMLS_SET_CTX(pool->ts); - -#ifdef PHP_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, php_http_request_pool_socket_callback); - curl_multi_setopt(pool->ch, CURLMOPT_TIMERDATA, pool); - curl_multi_setopt(pool->ch, CURLMOPT_TIMERFUNCTION, php_http_request_pool_timer_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); - -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Initialized request pool %p\n", pool); -#endif - - return pool; + return h; } -PHP_HTTP_API STATUS php_http_request_pool_attach(php_http_request_pool_t *pool, zval *request) +PHP_HTTP_API php_http_request_pool_t *php_http_request_pool_copy(php_http_request_pool_t *from, php_http_request_pool_t *to) { -#ifdef ZTS - TSRMLS_FETCH_FROM_CTX(pool->ts); -#endif - php_http_request_object_t *req = zend_object_store_get_object(request TSRMLS_CC); - -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Attaching HttpRequest(#%d) %p to pool %p\n", Z_OBJ_HANDLE_P(request), req, pool); -#endif - - if (req->pool) { - php_http_error(HE_WARNING, PHP_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 != php_http_request_object_requesthandler(req, request)) { - php_http_error(HE_WARNING, PHP_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) { - php_http_error(HE_WARNING, PHP_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; - - Z_ADDREF_P(request); - zend_llist_add_element(&pool->handles, &request); - ++pool->unfinished; - -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool); -#endif - return SUCCESS; - } + if (from->ops->copy) { + return from->ops->copy(from, to); } - return FAILURE; -} -PHP_HTTP_API STATUS php_http_request_pool_detach(php_http_request_pool_t *pool, zval *request) -{ - CURLMcode code; -#ifdef ZTS - TSRMLS_FETCH_FROM_CTX(pool->ts); -#endif - php_http_request_object_t *req = zend_object_store_get_object(request TSRMLS_CC); - -#if PHP_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 PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "HttpRequest object(#%d) %p is not attached to any HttpRequestPool\n", Z_OBJ_HANDLE_P(request), req); -#endif - } else if (req->pool != pool) { - php_http_error(HE_WARNING, PHP_HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is not attached to this HttpRequestPool", Z_OBJ_HANDLE_P(request)); - } else if (req->request->_progress.in_cb) { - php_http_error(HE_WARNING, PHP_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))) { - php_http_error(HE_WARNING, PHP_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, php_http_request_pool_compare_handles); - zend_llist_del_element(&pool->handles, request, php_http_request_pool_compare_handles); - -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "> %d HttpRequests remaining in pool %p\n", zend_llist_count(&pool->handles), pool); -#endif - - return SUCCESS; - } - return FAILURE; + return NULL; } -PHP_HTTP_API void php_http_request_pool_apply(php_http_request_pool_t *pool, php_http_request_pool_apply_func_t cb) +PHP_HTTP_API void php_http_request_pool_dtor(php_http_request_pool_t *h) { - int count = zend_llist_count(&pool->handles); + if (h->ops->dtor) { + h->ops->dtor(h); + } - if (count) { - int i = 0; - zend_llist_position pos; - zval **handle, **handles = emalloc(count * sizeof(zval *)); + zend_llist_clean(&h->requests.finished); + zend_llist_clean(&h->requests.attached); - 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; - } + if (h->persistent_handle_id) { + zval_ptr_dtor(&h->persistent_handle_id); + } +} - for (i = 0; i < count; ++i) { - if (cb(pool, handles[i])) { - break; - } - } - efree(handles); +PHP_HTTP_API void php_http_request_pool_free(php_http_request_pool_t **h) { + if (*h) { + php_http_request_pool_dtor(*h); + efree(*h); + *h = NULL; } } -PHP_HTTP_API void php_http_request_pool_apply_with_arg(php_http_request_pool_t *pool, php_http_request_pool_apply_with_arg_func_t cb, void *arg) +PHP_HTTP_API STATUS php_http_request_pool_attach(php_http_request_pool_t *h, zval *request) { - 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; - } + TSRMLS_FETCH_FROM_CTX(h->ts); - /* should never happen */ - if (i != count) { - zend_error(E_ERROR, "number of fetched request handles do not match overall count"); - count = i; - } + if (h->ops->attach) { + char *url = NULL; + php_http_request_method_t m = PHP_HTTP_NO_REQUEST_METHOD; + php_http_message_body_t *body = NULL; + php_http_request_object_t *obj = zend_object_store_get_object(request TSRMLS_CC); - for (i = 0; i < count; ++i) { - if (cb(pool, handles[i], arg)) { - break; - } + if (SUCCESS != php_http_request_object_requesthandler(obj, request, &m, &url, &body TSRMLS_CC)) { + return FAILURE; } - efree(handles); - } -} - -PHP_HTTP_API void php_http_request_pool_detach_all(php_http_request_pool_t *pool) -{ -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Detaching %d requests from pool %p\n", zend_llist_count(&pool->handles), pool); -#endif - php_http_request_pool_apply(pool, php_http_request_pool_detach); -} - -PHP_HTTP_API STATUS php_http_request_pool_send(php_http_request_pool_t *pool) -{ - TSRMLS_FETCH_FROM_CTX(pool->ts); - -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Attempt to send %d requests of pool %p\n", zend_llist_count(&pool->handles), pool); -#endif - -#ifdef PHP_HTTP_HAVE_EVENT - if (pool->useevents) { - do { -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "& Starting event dispatcher of pool %p\n", pool); -#endif - event_base_dispatch(PHP_HTTP_G->request_pool.event_base); - } while (pool->unfinished); - } else -#endif - { - while (php_http_request_pool_perform(pool)) { - if (SUCCESS != php_http_request_pool_select(pool, NULL)) { -#ifdef PHP_WIN32 - /* see http://msdn.microsoft.com/library/en-us/winsock/winsock/windows_sockets_error_codes_2.asp */ - php_http_error(HE_WARNING, PHP_HTTP_E_SOCKET, "WinSock error: %d", WSAGetLastError()); -#else - php_http_error(HE_WARNING, PHP_HTTP_E_SOCKET, strerror(errno)); -#endif - return FAILURE; - } + if (SUCCESS == h->ops->attach(h, obj->request, m, url, body)) { + STR_FREE(url); + Z_ADDREF_P(request); + zend_llist_add_element(&h->requests.attached, &request); + return SUCCESS; } + STR_FREE(url); } -#if PHP_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 - - return SUCCESS; + return FAILURE; } -PHP_HTTP_API void php_http_request_pool_dtor(php_http_request_pool_t *pool) +static int php_http_request_pool_compare_handles(void *h1, void *h2) { - TSRMLS_FETCH_FROM_CTX(pool->ts); - -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Destructing request pool %p\n", pool); -#endif - -#ifdef PHP_HTTP_HAVE_EVENT - efree(pool->timeout); -#endif - - php_http_request_pool_detach_all(pool); - - pool->unfinished = 0; - zend_llist_clean(&pool->finished); - zend_llist_clean(&pool->handles); - php_http_persistent_handle_release(ZEND_STRL("http_request_pool"), &pool->ch TSRMLS_CC); -} - -PHP_HTTP_API void php_http_request_pool_free(php_http_request_pool_t **pool) { - if (*pool) { - php_http_request_pool_dtor(*pool); - efree(*pool); - *pool = NULL; - } + return (Z_OBJ_HANDLE_PP((zval **) h1) == Z_OBJ_HANDLE_P((zval *) h2)); } -#ifdef PHP_WIN32 -# define SELECT_ERROR SOCKET_ERROR -#else -# define SELECT_ERROR -1 -#endif -PHP_HTTP_API STATUS php_http_request_pool_select(php_http_request_pool_t *pool, struct timeval *custom_timeout) +PHP_HTTP_API STATUS php_http_request_pool_detach(php_http_request_pool_t *h, zval *request) { - int MAX; - fd_set R, W, E; - struct timeval timeout; - -#ifdef PHP_HTTP_HAVE_EVENT - if (pool->useevents) { - TSRMLS_FETCH_FROM_CTX(pool->ts); - php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "not implemented; use HttpRequest callbacks"); - return FAILURE; - } -#endif - - if (custom_timeout && timerisset(custom_timeout)) { - timeout = *custom_timeout; - } else { - php_http_request_pool_timeout(pool, &timeout); - } + TSRMLS_FETCH_FROM_CTX(h->ts); - FD_ZERO(&R); - FD_ZERO(&W); - FD_ZERO(&E); + if (h->ops->detach) { + php_http_request_object_t *obj = zend_object_store_get_object(request TSRMLS_CC); - if (CURLM_OK == curl_multi_fdset(pool->ch, &R, &W, &E, &MAX)) { - if (MAX == -1) { - php_http_sleep((double) timeout.tv_sec + (double) (timeout.tv_usec / PHP_HTTP_MCROSEC)); - return SUCCESS; - } else if (SELECT_ERROR != select(MAX + 1, &R, &W, &E, &timeout)) { + if (SUCCESS == h->ops->detach(h, obj->request)) { + zend_llist_del_element(&h->requests.finished, request, php_http_request_pool_compare_handles); + zend_llist_del_element(&h->requests.attached, request, php_http_request_pool_compare_handles); return SUCCESS; } } + return FAILURE; } -PHP_HTTP_API int php_http_request_pool_perform(php_http_request_pool_t *pool) +PHP_HTTP_API STATUS php_http_request_pool_wait(php_http_request_pool_t *h, struct timeval *custom_timeout) { - TSRMLS_FETCH_FROM_CTX(pool->ts); - -#ifdef PHP_HTTP_HAVE_EVENT - if (pool->useevents) { - php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "not implemented; use HttpRequest callbacks"); - return FAILURE; + if (h->ops->wait) { + return h->ops->wait(h, custom_timeout); } -#endif - - while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished)); - -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "%u unfinished requests of pool %p remaining\n", pool->unfinished, pool); -#endif - php_http_request_pool_responsehandler(pool); - - return pool->unfinished; -} - -void php_http_request_pool_responsehandler(php_http_request_pool_t *pool) -{ - CURLMsg *msg; - int remaining = 0; - TSRMLS_FETCH_FROM_CTX(pool->ts); - - do { - msg = curl_multi_info_read(pool->ch, &remaining); - if (msg && CURLMSG_DONE == msg->msg) { - if (CURLE_OK != msg->data.result) { - php_http_request_storage_t *st = php_http_request_storage_get(msg->easy_handle); - php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(msg->data.result), STR_PTR(st->errorbuffer), STR_PTR(st->url)); - } - php_http_request_pool_apply_with_arg(pool, php_http_request_pool_apply_responsehandler, msg->easy_handle); - } - } while (remaining); + return FAILURE; } -int php_http_request_pool_apply_responsehandler(php_http_request_pool_t *pool, zval *req, void *ch) +PHP_HTTP_API int php_http_request_pool_once(php_http_request_pool_t *h) { -#ifdef ZTS - TSRMLS_FETCH_FROM_CTX(pool->ts); -#endif - php_http_request_object_t *obj = zend_object_store_get_object(req TSRMLS_CC); - - if ((!ch) || obj->request->ch == (CURL *) ch) { - -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_P(req), obj, obj->pool); -#endif - - Z_ADDREF_P(req); - zend_llist_add_element(&obj->pool->finished, &req); - php_http_request_object_responsehandler(obj, req); - return 1; + if (h->ops->once) { + return h->ops->once(h); } - return 0; + + return FAILURE; } -struct timeval *php_http_request_pool_timeout(php_http_request_pool_t *pool, struct timeval *timeout) +PHP_HTTP_API STATUS php_http_request_pool_exec(php_http_request_pool_t *h) { -#ifdef HAVE_CURL_MULTI_TIMEOUT - long max_tout = 1000; - - if ((CURLM_OK == curl_multi_timeout(pool->ch, &max_tout)) && (max_tout > 0)) { - timeout->tv_sec = max_tout / 1000; - timeout->tv_usec = (max_tout % 1000) * 1000; - } else { -#endif - timeout->tv_sec = 0; - timeout->tv_usec = 1000; -#ifdef HAVE_CURL_MULTI_TIMEOUT + if (h->ops->exec) { + return h->ops->exec(h); } -#endif -#if PHP_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; + return FAILURE; } -/*#*/ - -static int php_http_request_pool_compare_handles(void *h1, void *h2) +static void detach(void *r, void *h TSRMLS_DC) { - return (Z_OBJ_HANDLE_PP((zval **) h1) == Z_OBJ_HANDLE_P((zval *) h2)); + ((php_http_request_pool_t *) h)->ops->detach(h, ((php_http_request_object_t *) zend_object_store_get_object(*((zval **) r) TSRMLS_CC))->request); } -#ifdef PHP_HTTP_HAVE_EVENT - -static void php_http_request_pool_timeout_callback(int socket, short action, void *event_data) +PHP_HTTP_API void php_http_request_pool_reset(php_http_request_pool_t *h) { - php_http_request_pool_t *pool = event_data; - - if (pool->useevents) { - CURLMcode rc; - TSRMLS_FETCH_FROM_CTX(pool->ts); - -#if PHP_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 (h->ops->reset) { + h->ops->reset(h); + } else if (h->ops->detach) { + TSRMLS_FETCH_FROM_CTX(h->ts); - if (CURLM_OK != rc) { - php_http_error(HE_WARNING, PHP_HTTP_E_SOCKET, curl_multi_strerror(rc)); - } - - php_http_request_pool_responsehandler(pool); + zend_llist_apply_with_argument(&h->requests.attached, detach, h TSRMLS_CC); } + + zend_llist_clean(&h->requests.attached); + zend_llist_clean(&h->requests.finished); } -static void php_http_request_pool_event_callback(int socket, short action, void *event_data) +PHP_HTTP_API STATUS php_http_request_pool_setopt(php_http_request_pool_t *h, php_http_request_pool_setopt_opt_t opt, void *arg) { - php_http_request_pool_event_t *ev = event_data; - php_http_request_pool_t *pool = ev->pool; - - if (pool->useevents) { - CURLMcode rc = CURLE_OK; - TSRMLS_FETCH_FROM_CTX(ev->pool->ts); - -#if PHP_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->ch, socket, CURL_CSELECT_IN|CURL_CSELECT_OUT, &pool->unfinished); - break; - default: - php_http_error(HE_WARNING, PHP_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); - - switch (rc) { - case CURLM_BAD_SOCKET: -#if 0 - fprintf(stderr, "!!! Bad socket: %d (%d)\n", socket, (int) action); -#endif - case CURLM_OK: - break; - default: - php_http_error(HE_WARNING, PHP_HTTP_E_SOCKET, curl_multi_strerror(rc)); - break; - } - - php_http_request_pool_responsehandler(pool); - - /* remove timeout if there are no transfers left */ - if (!pool->unfinished && event_initialized(pool->timeout) && event_pending(pool->timeout, EV_TIMEOUT, NULL)) { - event_del(pool->timeout); -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Removed timeout of pool %p\n", pool); -#endif - } + if (h->ops->setopt) { + return h->ops->setopt(h, opt, arg); } + + return FAILURE; } -static int php_http_request_pool_socket_callback(CURL *easy, curl_socket_t sock, int action, void *socket_data, void *assign_data) +PHP_HTTP_API void php_http_request_pool_requests(php_http_request_pool_t *h, zval ***attached, zval ***finished) { - php_http_request_pool_t *pool = socket_data; + zval **handle; + int i, count; - if (pool->useevents) { - int events = EV_PERSIST; - php_http_request_pool_event_t *ev = assign_data; - TSRMLS_FETCH_FROM_CTX(pool->ts); + if (attached) { + if ((count = zend_llist_count(&h->requests.attached))) { + *attached = ecalloc(count + 1 /* terminating NULL */, sizeof(zval *)); - if (!ev) { - ev = ecalloc(1, sizeof(php_http_request_pool_event_t)); - ev->pool = pool; - curl_multi_assign(pool->ch, sock, ev); - event_base_set(PHP_HTTP_G->request_pool.event_base, &ev->evnt); + for (i = 0, handle = zend_llist_get_first(&h->requests.attached); handle; handle = zend_llist_get_next(&h->requests.attached)) { + Z_ADDREF_PP(handle); + (*attached)[i++] = *handle; + } } else { - event_del(&ev->evnt); + *attached = NULL; } - -#if PHP_HTTP_DEBUG_REQPOOLS - { - static const char action_strings[][8] = {"NONE", "IN", "OUT", "INOUT", "REMOVE"}; - php_http_request_t *r; - curl_easy_getinfo(easy, CURLINFO_PRIVATE, &r); - fprintf(stderr, "Callback on socket %2d (%8s) event %p of pool %p (%d)\n", (int) sock, action_strings[action], ev, pool, pool->unfinished); - } -#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: - php_http_error(HE_WARNING, PHP_HTTP_E_SOCKET, "Unknown socket action %d", action); - return -1; - } - - event_set(&ev->evnt, sock, events, php_http_request_pool_event_callback, ev); - event_add(&ev->evnt, NULL); } - return 0; -} + if (finished) { + if ((count = zend_llist_count(&h->requests.finished))) { + *finished = ecalloc(count + 1 /* terminating NULL */, sizeof(zval *)); -static void php_http_request_pool_timer_callback(CURLM *multi, long timeout_ms, void *timer_data) -{ - php_http_request_pool_t *pool = timer_data; - - if (pool->useevents) { - TSRMLS_FETCH_FROM_CTX(pool->ts); - struct timeval timeout; - - if (!event_initialized(pool->timeout)) { - event_set(pool->timeout, -1, 0, php_http_request_pool_timeout_callback, pool); - event_base_set(PHP_HTTP_G->request_pool.event_base, pool->timeout); - } else if (event_pending(pool->timeout, EV_TIMEOUT, NULL)) { - event_del(pool->timeout); - } - - if (timeout_ms > 0) { - timeout.tv_sec = timeout_ms / 1000; - timeout.tv_usec = (timeout_ms % 1000) * 1000; + for (i = 0, handle = zend_llist_get_first(&h->requests.finished); handle; handle = zend_llist_get_next(&h->requests.finished)) { + Z_ADDREF_PP(handle); + (*finished)[i++] = *handle; + } } else { - php_http_request_pool_timeout(pool, &timeout); + *finished = NULL; } - - event_add(pool->timeout, &timeout); - -#if PHP_HTTP_DEBUG_REQPOOLS - fprintf(stderr, "Updating timeout %lu (%lu, %lu) of pool %p\n", (ulong) timeout_ms, (ulong) timeout.tv_sec, (ulong) timeout.tv_usec, pool); -#endif } } -#endif /* HAVE_EVENT */ + +/*#*/ #define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpRequestPool, method, 0, req_args) #define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpRequestPool, method, 0) @@ -593,8 +217,8 @@ PHP_HTTP_BEGIN_ARGS(detach, 1) PHP_HTTP_END_ARGS; PHP_HTTP_EMPTY_ARGS(send); -PHP_HTTP_EMPTY_ARGS(socketPerform); -PHP_HTTP_BEGIN_ARGS(socketSelect, 0) +PHP_HTTP_EMPTY_ARGS(once); +PHP_HTTP_BEGIN_ARGS(wait, 0) PHP_HTTP_ARG_VAL(timeout, 0) PHP_HTTP_END_ARGS; @@ -619,15 +243,15 @@ PHP_HTTP_END_ARGS; zend_class_entry *php_http_request_pool_class_entry; zend_function_entry php_http_request_pool_method_entry[] = { - PHP_HTTP_REQPOOL_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_HTTP_REQPOOL_ME(__construct, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) PHP_HTTP_REQPOOL_ME(__destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) PHP_HTTP_REQPOOL_ME(attach, ZEND_ACC_PUBLIC) PHP_HTTP_REQPOOL_ME(detach, ZEND_ACC_PUBLIC) PHP_HTTP_REQPOOL_ME(send, ZEND_ACC_PUBLIC) PHP_HTTP_REQPOOL_ME(reset, ZEND_ACC_PUBLIC) - PHP_HTTP_REQPOOL_ME(socketPerform, ZEND_ACC_PROTECTED) - PHP_HTTP_REQPOOL_ME(socketSelect, ZEND_ACC_PROTECTED) + PHP_HTTP_REQPOOL_ME(once, ZEND_ACC_PROTECTED) + PHP_HTTP_REQPOOL_ME(wait, ZEND_ACC_PROTECTED) /* implements Iterator */ PHP_HTTP_REQPOOL_ME(valid, ZEND_ACC_PUBLIC) @@ -650,6 +274,11 @@ zend_function_entry php_http_request_pool_method_entry[] = { static zend_object_handlers php_http_request_pool_object_handlers; zend_object_value php_http_request_pool_object_new(zend_class_entry *ce TSRMLS_DC) +{ + return php_http_request_pool_object_new_ex(ce, NULL, NULL TSRMLS_CC); +} + +zend_object_value php_http_request_pool_object_new_ex(zend_class_entry *ce, php_http_request_pool_t *p, php_http_request_pool_object_t **ptr TSRMLS_DC) { zend_object_value ov; php_http_request_pool_object_t *o; @@ -658,7 +287,13 @@ zend_object_value php_http_request_pool_object_new(zend_class_entry *ce TSRMLS_D zend_object_std_init((zend_object *) o, ce TSRMLS_CC); object_properties_init((zend_object *) o, ce); - php_http_request_pool_init(&o->pool TSRMLS_CC); + if (!(o->pool = p)) { + o->pool = php_http_request_pool_init(NULL, NULL, NULL, NULL TSRMLS_CC); + } + + if (ptr) { + *ptr = o; + } ov.handle = zend_objects_store_put(o, NULL, php_http_request_pool_object_free, NULL TSRMLS_CC); ov.handlers = &php_http_request_pool_object_handlers; @@ -670,7 +305,7 @@ void php_http_request_pool_object_free(void *object TSRMLS_DC) { php_http_request_pool_object_t *o = (php_http_request_pool_object_t *) object; - php_http_request_pool_dtor(&o->pool); + php_http_request_pool_free(&o->pool); zend_object_std_dtor((zend_object *) o TSRMLS_CC); efree(o); } @@ -681,26 +316,11 @@ static void php_http_request_pool_object_llist2array(zval **req, zval *array TSR add_next_index_zval(array, *req); } -/* ### USERLAND ### */ PHP_METHOD(HttpRequestPool, __construct) { - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) { - int argc; - zval ***argv; - - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "*", &argv, &argc)) { - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(request_pool)) { - int i; - php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - - for (i = 0; i < argc; ++i) { - if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), php_http_request_class_entry TSRMLS_CC)) { - php_http_request_pool_attach(&obj->pool, *(argv[i])); - } - } - } end_error_handling(); - } + with_error_handling(EH_THROW, php_http_exception_class_entry) { + zend_parse_parameters_none(); } end_error_handling(); } @@ -712,7 +332,7 @@ PHP_METHOD(HttpRequestPool, __destruct) ; /* we always want to clean up */ } - php_http_request_pool_detach_all(&obj->pool); + php_http_request_pool_reset(obj->pool); } PHP_METHOD(HttpRequestPool, reset) @@ -721,79 +341,82 @@ PHP_METHOD(HttpRequestPool, reset) php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); obj->iterator.pos = 0; - php_http_request_pool_detach_all(&obj->pool); - RETURN_TRUE; + php_http_request_pool_reset(obj->pool); } - RETURN_FALSE; + RETVAL_ZVAL(getThis(), 1, 0); } PHP_METHOD(HttpRequestPool, attach) { - RETVAL_FALSE; - - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { zval *request; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, php_http_request_class_entry)) { - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (obj->iterator.pos > 0 && obj->iterator.pos < zend_llist_count(&obj->pool.handles)) { + if (obj->iterator.pos > 0 && obj->iterator.pos < zend_llist_count(&obj->pool->requests.attached)) { php_http_error(HE_THROW, PHP_HTTP_E_REQUEST_POOL, "Cannot attach to the HttpRequestPool while the iterator is active"); } else { - RETVAL_SUCCESS(php_http_request_pool_attach(&obj->pool, request)); + php_http_request_pool_attach(obj->pool, request); } } end_error_handling(); } } end_error_handling(); + + RETVAL_ZVAL(getThis(), 1, 0); } PHP_METHOD(HttpRequestPool, detach) { RETVAL_FALSE; - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { zval *request; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, php_http_request_class_entry)) { - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(request_pool)) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); obj->iterator.pos = -1; - RETVAL_SUCCESS(php_http_request_pool_detach(&obj->pool, request)); + php_http_request_pool_detach(obj->pool, request); } end_error_handling(); } } end_error_handling(); + + RETVAL_ZVAL(getThis(), 1, 0); } PHP_METHOD(HttpRequestPool, send) { RETVAL_FALSE; - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { if (SUCCESS == zend_parse_parameters_none()) { - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(request_pool)) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - RETVAL_SUCCESS(php_http_request_pool_send(&obj->pool)); + php_http_request_pool_exec(obj->pool); } end_error_handling(); } } end_error_handling(); + + RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpRequestPool, socketPerform) +PHP_METHOD(HttpRequestPool, once) { if (SUCCESS == zend_parse_parameters_none()) { php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (0 < php_http_request_pool_perform(&obj->pool)) { + if (0 < php_http_request_pool_once(obj->pool)) { RETURN_TRUE; } } RETURN_FALSE; } -PHP_METHOD(HttpRequestPool, socketSelect) +PHP_METHOD(HttpRequestPool, wait) { double timeout = 0; @@ -804,7 +427,7 @@ PHP_METHOD(HttpRequestPool, socketSelect) timeout_val.tv_sec = (time_t) timeout; timeout_val.tv_usec = PHP_HTTP_USEC(timeout) % PHP_HTTP_MCROSEC; - RETURN_SUCCESS(php_http_request_pool_select(&obj->pool, timeout ? &timeout_val : NULL)); + RETURN_SUCCESS(php_http_request_pool_wait(obj->pool, timeout ? &timeout_val : NULL)); } RETURN_FALSE; } @@ -814,7 +437,7 @@ PHP_METHOD(HttpRequestPool, valid) if (SUCCESS == zend_parse_parameters_none()) { php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - RETURN_BOOL(obj->iterator.pos >= 0 && obj->iterator.pos < zend_llist_count(&obj->pool.handles)); + RETURN_BOOL(obj->iterator.pos >= 0 && obj->iterator.pos < zend_llist_count(&obj->pool->requests.attached)); } RETURN_FALSE; } @@ -824,14 +447,14 @@ PHP_METHOD(HttpRequestPool, current) if (SUCCESS == zend_parse_parameters_none()) { php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (obj->iterator.pos < zend_llist_count(&obj->pool.handles)) { + if (obj->iterator.pos < zend_llist_count(&obj->pool->requests.attached)) { long pos = 0; zval **current = NULL; zend_llist_position lpos; - for ( current = zend_llist_get_first_ex(&obj->pool.handles, &lpos); + for ( current = zend_llist_get_first_ex(&obj->pool->requests.attached, &lpos); current && obj->iterator.pos != pos++; - current = zend_llist_get_next_ex(&obj->pool.handles, &lpos)); + current = zend_llist_get_next_ex(&obj->pool->requests.attached, &lpos)); if (current) { RETURN_OBJECT(*current, 1); } @@ -873,7 +496,7 @@ PHP_METHOD(HttpRequestPool, count) if (SUCCESS == zend_parse_parameters_none()) { php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - RETURN_LONG((long) zend_llist_count(&obj->pool.handles)); + RETURN_LONG((long) zend_llist_count(&obj->pool->requests.attached)); } } @@ -883,7 +506,7 @@ PHP_METHOD(HttpRequestPool, getAttachedRequests) php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); array_init(return_value); - zend_llist_apply_with_argument(&obj->pool.handles, + zend_llist_apply_with_argument(&obj->pool->requests.attached, (llist_apply_with_arg_func_t) php_http_request_pool_object_llist2array, return_value TSRMLS_CC); return; @@ -897,7 +520,7 @@ PHP_METHOD(HttpRequestPool, getFinishedRequests) php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); array_init(return_value); - zend_llist_apply_with_argument(&obj->pool.finished, + zend_llist_apply_with_argument(&obj->pool->requests.finished, (llist_apply_with_arg_func_t) php_http_request_pool_object_llist2array, return_value TSRMLS_CC); return; @@ -912,11 +535,9 @@ PHP_METHOD(HttpRequestPool, enablePipelining) if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable)) { php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (CURLM_OK == curl_multi_setopt(obj->pool.ch, CURLMOPT_PIPELINING, (long) enable)) { - RETURN_TRUE; - } + php_http_request_pool_setopt(obj->pool, PHP_HTTP_REQUEST_POOL_OPT_ENABLE_PIPELINING, &enable); } - RETURN_FALSE; + RETVAL_ZVAL(getThis(), 1, 0); } PHP_METHOD(HttpRequestPool, enableEvents) @@ -924,41 +545,22 @@ PHP_METHOD(HttpRequestPool, enableEvents) zend_bool enable = 1; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable)) { -#if PHP_HTTP_HAVE_EVENT php_http_request_pool_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - obj->pool.useevents = enable; - RETURN_TRUE; -#endif + php_http_request_pool_setopt(obj->pool, PHP_HTTP_REQUEST_POOL_OPT_USE_EVENTS, &enable); } - RETURN_FALSE; + RETVAL_ZVAL(getThis(), 1, 0); } PHP_MINIT_FUNCTION(http_request_pool) { - if (SUCCESS != php_http_persistent_handle_provide(ZEND_STRL("http_request_pool"), curl_multi_init, (php_http_persistent_handle_dtor_t) curl_multi_cleanup, NULL TSRMLS_CC)) { - return FAILURE; - } - - PHP_HTTP_REGISTER_CLASS(http\\request, Pool, http_request_pool, php_http_object_class_entry, 0); + PHP_HTTP_REGISTER_CLASS(http\\Request, Pool, http_request_pool, php_http_object_class_entry, 0); php_http_request_pool_class_entry->create_object = php_http_request_pool_object_new; memcpy(&php_http_request_pool_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_request_pool_object_handlers.clone_obj = NULL; - zend_class_implements(php_http_request_pool_class_entry TSRMLS_CC, 2, spl_ce_Countable, zend_ce_iterator); + zend_class_implements(php_http_request_pool_class_entry TSRMLS_CC, 3, spl_ce_Countable, zend_ce_iterator, php_http_fluently_callable_class_entry); return SUCCESS; } -PHP_RINIT_FUNCTION(http_request_pool) -{ -#ifdef PHP_HTTP_HAVE_EVENT - if (!PHP_HTTP_G->request_pool.event_base && !(PHP_HTTP_G->request_pool.event_base = event_init())) { - return FAILURE; - } -#endif - - return SUCCESS; -} - -