# define HTTP_DEBUG_REQPOOLS 0
#endif
-static void http_request_pool_freebody(http_request_body **body);
+ZEND_EXTERN_MODULE_GLOBALS(http);
+
+#ifndef HAVE_CURL_MULTI_STRERROR
+# define curl_multi_strerror(dummy) "unknown error"
+#endif
+
+static void http_request_pool_freebody(http_request_callback_ctx **body);
static int http_request_pool_compare_handles(void *h1, void *h2);
/* {{{ http_request_pool *http_request_pool_init(http_request_pool *) */
{
zend_bool free_pool;
#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Initializing request pool\n");
+ fprintf(stderr, "Initializing request pool %p\n", pool);
#endif
if ((free_pool = (!pool))) {
pool = emalloc(sizeof(http_request_pool));
if (!pool->ch) {
if (!(pool->ch = curl_multi_init())) {
- http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl");
+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initialize curl");
if (free_pool) {
efree(pool);
}
pool->unfinished = 0;
zend_llist_init(&pool->handles, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0);
- zend_llist_init(&pool->bodies, sizeof(http_request_body *), (llist_dtor_func_t) http_request_pool_freebody, 0);
+ zend_llist_init(&pool->bodies, sizeof(http_request_callback_ctx *), (llist_dtor_func_t) http_request_pool_freebody, 0);
#if HTTP_DEBUG_REQPOOLS
fprintf(stderr, "Initialized request pool %p\n", pool);
#endif
{
getObjectEx(http_request_object, req, request);
#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Attaching request %p to pool %p\n", req, pool);
+ fprintf(stderr, "Attaching HttpRequest(#%d) %p to pool %p\n", Z_OBJ_HANDLE_P(request), req, pool);
#endif
if (req->pool) {
- http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is already member of an HttpRequestPool");
+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is already member of %s HttpRequestPool", Z_OBJ_HANDLE_P(request), req->pool == pool ? "this" : "another");
} else {
- CURLMcode code;
- http_request_body *body = http_request_body_new();
- zval *info = GET_PROP_EX(req, request, responseInfo);
+ http_request_callback_ctx *body = http_request_callback_data_ex(http_request_body_new(), 0);
- if (SUCCESS != http_request_object_requesthandler(req, request, body)) {
- http_error_ex(E_WARNING, HTTP_E_CURL, "Could not initialize HttpRequest object for attaching to the HttpRequestPool");
+ if (SUCCESS != http_request_pool_requesthandler(request, body->data)) {
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not initialize HttpRequest object for attaching to the HttpRequestPool");
} else {
- code = curl_multi_add_handle(pool->ch, req->ch);
+ CURLMcode code = curl_multi_add_handle(pool->ch, req->ch);
+
if ((CURLM_OK != code) && (CURLM_CALL_MULTI_PERFORM != code)) {
- http_error_ex(E_WARNING, HTTP_E_CURL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code));
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code));
} else {
req->pool = pool;
+
zend_llist_add_element(&pool->handles, &request);
zend_llist_add_element(&pool->bodies, &body);
+
zval_add_ref(&request);
+ zend_objects_store_add_ref(request TSRMLS_CC);
+
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool);
+#endif
return SUCCESS;
}
}
+ efree(body->data);
efree(body);
}
return FAILURE;
{
getObjectEx(http_request_object, req, request);
#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Detaching request %p from pool %p\n", req, pool);
+ 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 HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "HttpRequest object(#%d) %p is not attached to any HttpRequestPool\n", Z_OBJ_HANDLE_P(request), req);
#endif
- if (req->pool != pool) {
- http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to this HttpRequestPool");
+ } else if (req->pool != pool) {
+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is not attached to this HttpRequestPool", Z_OBJ_HANDLE_P(request));
} else {
CURLMcode code;
+ req->pool = NULL;
+ zend_llist_del_element(&pool->handles, request, http_request_pool_compare_handles);
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "> %d HttpRequests remaining in pool %p\n", zend_llist_count(&pool->handles), pool);
+#endif
if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->ch))) {
- http_error_ex(E_WARNING, HTTP_E_CURL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code));
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code));
} else {
- req->pool = NULL;
- zend_llist_del_element(&pool->handles, request, http_request_pool_compare_handles);
return SUCCESS;
}
}
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) {
http_request_pool_detach(pool, handles[i]);
}
efree(handles);
}
+#if HTTP_DEBUG_REQPOOLS
+ fprintf(stderr, "Destroying %d request bodies of pool %p\n", zend_llist_count(&pool->bodies), pool);
+#endif
+ /* free created bodies too */
+ zend_llist_clean(&pool->bodies);
}
-
/* {{{ 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)) {
-#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "%d unfinished requests of pool %p remaining\n", pool->unfinished, pool);
-#endif
if (SUCCESS != http_request_pool_select(pool)) {
- http_error(E_WARNING, HTTP_E_CURL, "Socket error");
+#ifdef PHP_WIN32
+ http_error(HE_WARNING, HTTP_E_SOCKET, WSAGetLastError());
+#else
+ http_error(HE_WARNING, HTTP_E_SOCKET, strerror(errno));
+#endif
return FAILURE;
}
}
+#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);
+ {
+ int remaining = 0;
+ CURLMsg *msg;
+ /*
+ * FIXXME: populate --somehow
+ */
+ do {
+ if (msg = curl_multi_info_read(pool->ch, &remaining))
+ fprintf(stderr, "CURL: %s (%d)\n", curl_easy_strerror(msg->data.result), msg->data.result);
+ } while (remaining);
+ }
+#endif
zend_llist_apply(&pool->handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC);
return SUCCESS;
}
}
/* }}} */
+/* {{{ STATUS http_request_pool_requesthandler(zval *, http_request_body *) */
+STATUS _http_request_pool_requesthandler(zval *request, http_request_body *body TSRMLS_DC)
+{
+ getObjectEx(http_request_object, req, request);
+ if (SUCCESS == http_request_object_requesthandler(req, request, body)) {
+ http_request_conv(req->ch, &req->response, &req->request);
+ return SUCCESS;
+ }
+ return FAILURE;
+}
+/* }}} */
+
/* {{{ void http_request_pool_responsehandler(zval **) */
void _http_request_pool_responsehandler(zval **req TSRMLS_DC)
{
getObjectEx(http_request_object, obj, *req);
#if HTTP_DEBUG_REQPOOLS
- fprintf(stderr, "Fetching data from request %p of pool %p\n", obj, obj->pool);
+ fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_PP(req), obj, obj->pool);
#endif
http_request_object_responsehandler(obj, *req);
}
/*#*/
-/* {{{ static void http_request_pool_freebody(http_request_body **) */
-static void http_request_pool_freebody(http_request_body **body)
+/* {{{ static void http_request_pool_freebody(http_request_ctx **) */
+static void http_request_pool_freebody(http_request_callback_ctx **body)
{
- TSRMLS_FETCH();
- http_request_body_free(*body);
+ HTTP_REQUEST_CALLBACK_DATA(*body, http_request_body *, b);
+ http_request_body_free(b);
+ efree(*body);
}
/* }}} */
/* {{{ static int http_request_pool_compare_handles(void *, void *) */
static int http_request_pool_compare_handles(void *h1, void *h2)
{
- return ((*((zval **) h1)) == ((zval *) h2));
+ int match = (Z_OBJ_HANDLE_PP((zval **) h1) == Z_OBJ_HANDLE_P((zval *) h2));
+#if HTTP_DEBUG_REQPOOLS
+ /* if(match) fprintf(stderr, "OK\n"); */
+#endif
+ return match;
}
/* }}} */
projects / m6w6 / ext-http / blobdiff