| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
TSRMLS_SET_CTX(pool->tsrm_ls);
-#if HTTP_HAVE_EVENT
+#ifdef 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);
/* {{{ STATUS http_request_pool_attach(http_request_pool *, zval *) */
PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request)
{
+#ifdef ZTS
TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+#endif
getObjectEx(http_request_object, req, request);
#if HTTP_DEBUG_REQPOOLS
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
PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request)
{
CURLMcode code;
+#ifdef ZTS
TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+#endif
getObjectEx(http_request_object, req, request);
#if HTTP_DEBUG_REQPOOLS
#if HTTP_DEBUG_REQPOOLS
fprintf(stderr, "> %d HttpRequests remaining in pool %p\n", zend_llist_count(&pool->handles), pool);
#endif
-
+
return SUCCESS;
}
return FAILURE;
#ifdef HTTP_HAVE_EVENT
if (pool->useevents) {
- /* run socket action */
- pool->runsocket = 1;
do {
- while (CURLM_CALL_MULTI_PERFORM == curl_multi_socket_all(pool->ch, &pool->unfinished));
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "& Starting event dispatcher of pool %p\n", pool);
+#endif
event_base_dispatch(HTTP_G->request.pool.event.base);
} while (pool->unfinished);
} else
fprintf(stderr, "Destructing request pool %p\n", pool);
#endif
-#if HTTP_HAVE_EVENT
+#ifdef HTTP_HAVE_EVENT
efree(pool->timeout);
#endif
+ http_request_pool_detach_all(pool);
+
pool->unfinished = 0;
zend_llist_clean(&pool->finished);
zend_llist_clean(&pool->handles);
/* {{{ STATUS http_request_pool_select(http_request_pool *) */
PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
+{
+ return http_request_pool_select_ex(pool, NULL);
+}
+/* }}} */
+
+/* {{{ STATUS http_request_pool_select_ex(http_request_pool *, struct timeval *) */
+PHP_HTTP_API STATUS _http_request_pool_select_ex(http_request_pool *pool, struct timeval *custom_timeout)
{
int MAX;
fd_set R, W, E;
}
#endif
- http_request_pool_timeout(pool, &timeout);
+ if (custom_timeout && timerisset(custom_timeout)) {
+ timeout = *custom_timeout;
+ } else {
+ http_request_pool_timeout(pool, &timeout);
+ }
FD_ZERO(&R);
FD_ZERO(&W);
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_storage *st = http_request_storage_get(msg->easy_handle);
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(msg->data.result), st?st->errorbuffer:"", st?st->url:"");
}
http_request_pool_apply_with_arg(pool, _http_request_pool_apply_responsehandler, msg->easy_handle);
}
/* {{{ 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)
{
+#ifdef ZTS
TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+#endif
getObjectEx(http_request_object, obj, req);
if ((!ch) || obj->request->ch == (CURL *) ch) {
#ifdef HAVE_CURL_MULTI_TIMEOUT
long max_tout = 1000;
- if ((CURLM_OK == curl_multi_timeout(pool->ch, &max_tout)) && (max_tout != -1)) {
+ 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 = 1;
- timeout->tv_usec = 0;
+ timeout->tv_sec = 0;
+ timeout->tv_usec = 1000;
#ifdef HAVE_CURL_MULTI_TIMEOUT
}
#endif
if (CURLM_OK != rc) {
http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc));
}
-
- http_request_pool_timer_callback(pool->ch, 1000, pool);
+
+ http_request_pool_responsehandler(pool);
}
}
/* }}} */
#endif
} while (CURLM_CALL_MULTI_PERFORM == rc);
- if (CURLM_OK != rc) {
- http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(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:
+ http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc));
+ break;
}
http_request_pool_responsehandler(pool);
ev = ecalloc(1, sizeof(http_request_pool_event));
ev->pool = pool;
curl_multi_assign(pool->ch, sock, ev);
+ event_base_set(HTTP_G->request.pool.event.base, &ev->evnt);
} else {
event_del(&ev->evnt);
}
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);
+ fprintf(stderr, "Callback on socket %2d (%8s) event %p of pool %p (%d)\n", (int) sock, action_strings[action], ev, pool, pool->unfinished);
}
#endif
}
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);
}
if (pool->useevents) {
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)) {
+ struct timeval timeout;
+
+ if (!event_initialized(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);
+ } else if (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);
+ if (timeout_ms > 0) {
+ timeout.tv_sec = timeout_ms / 1000;
+ timeout.tv_usec = (timeout_ms % 1000) * 1000;
+ } else {
+ http_request_pool_timeout(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);
+ fprintf(stderr, "Updating timeout %lu (%lu, %lu) of pool %p\n", (ulong) timeout_ms, (ulong) timeout.tv_sec, (ulong) timeout.tv_usec, pool);
#endif
}
}
projects / m6w6 / ext-http / blobdiff