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);
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;
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
#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);
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);
}
/* }}} */
/* {{{ 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);
}
}
return FAILURE;
-#endif
}
/* }}} */
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
}
/* }}} */
/* }}} */
#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)
{
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);
}
/* }}} */
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
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
}
}
/* }}} */
#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
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 */