}
/* }}} */
-/* {{{ void http_request_pool_detach_all(http_request_pool *) */
-PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC)
+/* {{{ 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)
{
int count = zend_llist_count(&pool->handles);
-#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Detaching %d requests from pool %p\n", count, pool);
-#endif
+ 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;
+ }
+
+ /* should never happen */
+ if (i != count) {
+ zend_error(E_ERROR, "number of fetched request handles do not match overall count");
+ count = i;
+ }
+
+ for (i = 0; i < count; ++i) {
+ if (cb(pool, handles[i] TSRMLS_CC)) {
+ break;
+ }
+ }
+ efree(handles);
+ }
+}
+/* }}} */
+
+/* {{{ 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)
+{
+ int count = zend_llist_count(&pool->handles);
- /*
- * we cannot apply a function to the llist which actually detaches
- * the curl handle *and* removes the llist element --
- * so let's get our hands dirty
- */
if (count) {
int i = 0;
zend_llist_position pos;
}
for (i = 0; i < count; ++i) {
- http_request_pool_detach(pool, handles[i]);
+ if (cb(pool, handles[i], arg TSRMLS_CC)) {
+ break;
+ }
}
efree(handles);
}
}
+/* }}} */
+
+/* {{{ void http_request_pool_detach_all(http_request_pool *) */
+PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC)
+{
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "Detaching %d requests from pool %p\n", zend_llist_count(&pool->handles), pool);
+#endif
+ http_request_pool_apply(pool, _http_request_pool_detach);
+}
+/* }}} */
/* {{{ STATUS http_request_pool_send(http_request_pool *) */
PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
fprintf(stderr, "Attempt to send %d requests of pool %p\n", zend_llist_count(&pool->handles), pool);
#endif
- while (http_request_pool_perform(pool)) {
+ while (http_request_pool_perform(pool, 0)) {
if (SUCCESS != http_request_pool_select(pool)) {
#ifdef PHP_WIN32
http_error(HE_WARNING, HTTP_E_SOCKET, WSAGetLastError());
/* }}} */
/* {{{ 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, int once TSRMLS_DC)
{
CURLMsg *msg;
int remaining = 0;
while ((msg = curl_multi_info_read(pool->ch, &remaining))) {
if (CURLMSG_DONE == msg->msg) {
- if (CURLE_OK != msg->data.result) {
+ if (CURLE_OK != msg->data.result) {
+ http_request_pool_try {
+ 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_catch();
+ }
http_request_pool_try {
- 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);
} http_request_pool_catch();
- }
- http_request_pool_try {
- zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_responsehandler, msg->easy_handle TSRMLS_CC);
- } http_request_pool_catch();
}
}
- http_request_pool_final();
+ if (once || !pool->unfinished) {
+ http_request_pool_final();
+ }
return pool->unfinished;
}
/* }}} */
-/* {{{ void http_request_pool_responsehandler(zval **) */
-void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC)
+/* {{{ 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)
{
- getObjectEx(http_request_object, obj, *req);
+ getObjectEx(http_request_object, obj, req);
- if (obj->request->ch == ch) {
+ if ((!ch) || obj->request->ch == (CURL *) ch) {
#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_PP(req), obj, obj->pool);
+ fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_P(req), obj, obj->pool);
#endif
- ZVAL_ADDREF(*req);
- zend_llist_add_element(&obj->pool->finished, req);
- http_request_object_responsehandler(obj, *req);
- }
-}
-/* }}} */
-
-static void move_backtrace_args(zval *from, zval *to TSRMLS_DC)
-{
- zval **args, **trace_0, *old_trace_0, *trace = NULL;
-
- if ((trace = zend_read_property(zend_exception_get_default(), from, "trace", lenof("trace"), 0 TSRMLS_CC))) {
- if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void **) &trace_0)) {
- old_trace_0 = *trace_0;
- if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(trace_0), "args", sizeof("args"), (void **) &args)) {
- if ((trace = zend_read_property(zend_exception_get_default(), to, "trace", lenof("trace"), 0 TSRMLS_CC))) {
- if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void **) &trace_0)) {
- ZVAL_ADDREF(*args);
- add_assoc_zval(*trace_0, "args", *args);
- zend_hash_del(Z_ARRVAL_P(old_trace_0), "args", sizeof("args"));
- }
- }
- }
- }
- }
-}
-/* {{{ void http_request_pool_wrap_exception(zval *, zval *) */
-void _http_request_pool_wrap_exception(zval *old_exception, zval *new_exception TSRMLS_DC)
-{
- zend_class_entry *ce = HTTP_EX_CE(request_pool);
-
- /* if old_exception is already an HttpRequestPoolException append the new one,
- else create a new HttpRequestPoolException and append the old and new exceptions */
- if (old_exception && Z_OBJCE_P(old_exception) == ce) {
- zval *old_exprop, *new_exprop;
-
- MAKE_STD_ZVAL(new_exprop);
- array_init(new_exprop);
- old_exprop = zend_read_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), 0 TSRMLS_CC);
- if (Z_TYPE_P(old_exprop) == IS_ARRAY) {
- array_copy(old_exprop, new_exprop);
- }
- add_next_index_zval(new_exprop, new_exception);
- zend_update_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), new_exprop TSRMLS_CC);
- zval_ptr_dtor(&new_exprop);
-
- EG(exception) = old_exception;
- } else if (new_exception && Z_OBJCE_P(new_exception) != ce){
- zval *exval, *exprop;
-
- MAKE_STD_ZVAL(exval);
- object_init_ex(exval, ce);
- MAKE_STD_ZVAL(exprop);
- array_init(exprop);
-
- if (old_exception) {
- add_next_index_zval(exprop, old_exception);
- }
- move_backtrace_args(new_exception, exval TSRMLS_CC);
- zend_update_property_long(ce, exval, "code", lenof("code"), HTTP_E_REQUEST_POOL TSRMLS_CC);
- zend_update_property_string(ce, exval, "message", lenof("message"), "See exceptionStack property" TSRMLS_CC);
- add_next_index_zval(exprop, new_exception);
- zend_update_property(ce, exval, "exceptionStack", lenof("exceptionStack"), exprop TSRMLS_CC);
- zval_ptr_dtor(&exprop);
-
- EG(exception) = exval;
+ ZVAL_ADDREF(req);
+ zend_llist_add_element(&obj->pool->finished, &req);
+ http_request_object_responsehandler(obj, req);
+ return 1;
}
+ return 0;
}
/* }}} */