X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_request_pool_api.c;h=337d15023ec6476ddd171c5edd76af8103f93e96;hb=c60c46e6a6f5c3e4bed253a2a1b893a53e26bbfc;hp=4fa5bb6eb4fb413052a1f5cf1e367eeec75ed510;hpb=fa184d3b9f22921108a64c8062f07e3b8bb01e72;p=m6w6%2Fext-http diff --git a/http_request_pool_api.c b/http_request_pool_api.c index 4fa5bb6..337d150 100644 --- a/http_request_pool_api.c +++ b/http_request_pool_api.c @@ -36,10 +36,10 @@ typedef struct _http_request_pool_event_t { 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 *); +static void http_request_pool_timer_callback(CURLM *multi, long timeout_ms, void *timer_data); #endif static int http_request_pool_compare_handles(void *h1, void *h2); @@ -90,6 +90,8 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool 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); + curl_multi_setopt(pool->ch, CURLMOPT_TIMERDATA, pool); + curl_multi_setopt(pool->ch, CURLMOPT_TIMERFUNCTION, http_request_pool_timer_callback); #endif pool->unfinished = 0; @@ -120,15 +122,21 @@ 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)) { + + 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; ZVAL_ADDREF(request); zend_llist_add_element(&pool->handles, &request); + ++pool->unfinished; +#ifdef HTTP_HAVE_EVENT + if (pool->runsocket) { + while (CURLM_CALL_MULTI_PERFORM == curl_multi_socket_all(pool->ch, &pool->unfinished)); + } +#endif #if HTTP_DEBUG_REQPOOLS fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool); #endif @@ -256,23 +264,28 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool) #endif #ifdef HTTP_HAVE_EVENT - 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); + if (pool->useevents) { + /* run socket action */ + pool->runsocket = 1; + do { + while (CURLM_CALL_MULTI_PERFORM == curl_multi_socket_all(pool->ch, &pool->unfinished)); + event_base_dispatch(HTTP_G->request.pool.event.base); + } while (pool->unfinished); + } 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()); #else - 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()); -# else - http_error(HE_WARNING, HTTP_E_SOCKET, strerror(errno)); -# endif - return FAILURE; + http_error(HE_WARNING, HTTP_E_SOCKET, strerror(errno)); +#endif + return FAILURE; + } } } -#endif #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); @@ -291,10 +304,13 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool) 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); - efree(pool->timeout); http_persistent_handle_release("http_request_pool", &pool->ch); } /* }}} */ @@ -308,15 +324,18 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool) /* {{{ STATUS http_request_pool_select(http_request_pool *) */ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool) { -#ifdef HTTP_HAVE_EVENT - TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); - http_error(HE_WARNING, HTTP_E_RUNTIME, "not implemented; use HttpRequest::onProgress callback"); - return FAILURE; -#else int MAX; fd_set R, W, E; 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); @@ -332,7 +351,6 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool) } } return FAILURE; -#endif } /* }}} */ @@ -340,19 +358,23 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool) PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool) { TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); + #ifdef HTTP_HAVE_EVENT - http_error(HE_WARNING, HTTP_E_RUNTIME, "not implemented; use HttpRequest::onProgress callback"); - return FAILURE; -#else - CURLMsg *msg; - int remaining = 0; + 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)); - http_request_pool_response_handler(pool); +#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; -#endif } /* }}} */ @@ -433,31 +455,6 @@ 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) { @@ -475,7 +472,7 @@ static void http_request_pool_timeout_callback(int socket, short action, void *e http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc)); } - http_request_pool_update_timeout(pool); + http_request_pool_timer_callback(pool->ch, 1000, pool); } /* }}} */ @@ -505,10 +502,10 @@ static void http_request_pool_event_callback(int socket, short action, void *eve 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); + rc = curl_multi_socket_action(pool->ch, socket, CURL_CSELECT_IN|CURL_CSELECT_OUT, &pool->unfinished); break; default: - http_error(HE_WARNING, HTTP_E_SOCKET, "Unknown event %d", (int) action); + http_error_ex(HE_WARNING, HTTP_E_SOCKET, "Unknown event %d", (int) action); return; } #else @@ -522,8 +519,12 @@ static void http_request_pool_event_callback(int socket, short action, void *eve http_request_pool_responsehandler(pool); - if (!pool->unfinished) { - http_request_pool_update_timeout(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 HTTP_DEBUG_REQPOOLS + fprintf(stderr, "Removed timeout of pool %p\n", pool); +#endif } } /* }}} */ @@ -547,7 +548,9 @@ static int http_request_pool_socket_callback(CURL *easy, curl_socket_t sock, int #if HTTP_DEBUG_REQPOOLS { static const char action_strings[][8] = {"NONE", "IN", "OUT", "INOUT", "REMOVE"}; - fprintf(stderr, "Callback on socket %d (%s) event %p of pool %p\n", (int) sock, action_strings[action], ev, pool); + 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 @@ -579,6 +582,27 @@ static int http_request_pool_socket_callback(CURL *easy, curl_socket_t sock, int return 0; } /* }}} */ + +/* {{{ static void http_request_pool_timer_callback(CURLM *, long, void*) */ +static void http_request_pool_timer_callback(CURLM *multi, long timeout_ms, void *timer_data) +{ + http_request_pool *pool = timer_data; + TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); + struct timeval timeout = {timeout_ms / 1000, (timeout_ms % 1000) * 1000}; + + if (event_initialized(pool->timeout) && event_pending(pool->timeout, EV_TIMEOUT, NULL)) { + event_del(pool->timeout); + } + + 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, &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 +} +/* }}} */ #endif /* HTTP_HAVE_EVENT */ #endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */