X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=04acb2e6f07047f14723823bc472f7f1b72bd959;hp=32176ac21c515eee54340d1db536e24c06c00e82;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=caecdff1920aed4c6b98b0a23598e9d359ece50b

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index 32176ac..04acb2e 100644
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -6,7 +6,7 @@
     | 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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -86,7 +86,7 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool
 	
 	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);
@@ -109,7 +109,9 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool
 /* {{{ 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
@@ -123,17 +125,6 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 	} else {
 		CURLMcode code = curl_multi_add_handle(pool->ch, req->request->ch);
 		
-		while (CURLM_CALL_MULTI_PERFORM == code) {
-#ifdef HTTP_HAVE_EVENT
-			if (pool->useevents) {
-				code = curl_multi_socket_all(pool->ch, &pool->unfinished);
-			} else {
-#endif
-				code = curl_multi_perform(pool->ch, &pool->unfinished);
-#ifdef HTTP_HAVE_EVENT
-			}
-#endif
-		}
 		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 {
@@ -141,6 +132,7 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 
 			ZVAL_ADDREF(request);
 			zend_llist_add_element(&pool->handles, &request);
+			++pool->unfinished;
 
 #if HTTP_DEBUG_REQPOOLS
 			fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool);
@@ -156,7 +148,9 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 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
@@ -182,7 +176,7 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req
 #if HTTP_DEBUG_REQPOOLS
 		fprintf(stderr, "> %d HttpRequests remaining in pool %p\n", zend_llist_count(&pool->handles), pool);
 #endif
-	
+		
 		return SUCCESS;
 	}
 	return FAILURE;
@@ -270,8 +264,12 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool)
 	
 #ifdef HTTP_HAVE_EVENT
 	if (pool->useevents) {
-		while (CURLM_CALL_MULTI_PERFORM == curl_multi_socket_all(pool->ch, &pool->unfinished));
-		event_base_dispatch(HTTP_G->request.pool.event.base);
+		do {
+#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
 #endif
 	{
@@ -305,10 +303,12 @@ 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
+#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);
@@ -324,6 +324,13 @@ 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)
+{
+	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;
@@ -337,7 +344,11 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
 	}
 #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);
@@ -390,9 +401,8 @@ void _http_request_pool_responsehandler(http_request_pool *pool)
 		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);
 		}
@@ -403,7 +413,9 @@ void _http_request_pool_responsehandler(http_request_pool *pool)
 /* {{{ 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) {
@@ -427,13 +439,13 @@ struct timeval *_http_request_pool_timeout(http_request_pool *pool, struct timev
 #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
@@ -459,18 +471,23 @@ static int http_request_pool_compare_handles(void *h1, void *h2)
 /* {{{ static void http_request_pool_timeout_callback(int, short, void *) */
 static void http_request_pool_timeout_callback(int socket, short action, void *event_data)
 {
-	CURLMcode rc;
 	http_request_pool *pool = event_data;
-	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
 	
+	if (pool->useevents) {
+		CURLMcode rc;
+		TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+		
 #if HTTP_DEBUG_REQPOOLS
-	fprintf(stderr, "Timeout occurred of pool %p\n", pool);
+		fprintf(stderr, "Timeout occurred of pool %p\n", pool);
 #endif
-	
-	while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket(pool->ch, CURL_SOCKET_TIMEOUT, &pool->unfinished)));
-	
-	if (CURLM_OK != rc) {
-		http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc));
+		
+		while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket(pool->ch, CURL_SOCKET_TIMEOUT, &pool->unfinished)));
+		
+		if (CURLM_OK != rc) {
+			http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc));
+		}
+
+		http_request_pool_responsehandler(pool);
 	}
 }
 /* }}} */
@@ -478,52 +495,63 @@ static void http_request_pool_timeout_callback(int socket, short action, void *e
 /* {{{ static void http_request_pool_event_callback(int, short, void *) */
 static void http_request_pool_event_callback(int socket, short action, void *event_data)
 {
-	CURLMcode rc = CURLE_OK;
 	http_request_pool_event *ev = event_data;
 	http_request_pool *pool = ev->pool;
-	TSRMLS_FETCH_FROM_CTX(ev->pool->tsrm_ls);
-		
+	
+	if (pool->useevents) {
+		CURLMcode rc = CURLE_OK;
+		TSRMLS_FETCH_FROM_CTX(ev->pool->tsrm_ls);
+			
 #if HTTP_DEBUG_REQPOOLS
-	{
-		static const char event_strings[][20] = {"NONE","TIMEOUT","READ","TIMEOUT|READ","WRITE","TIMEOUT|WRITE","READ|WRITE","TIMEOUT|READ|WRITE","SIGNAL"};
-		fprintf(stderr, "Event on socket %d (%s) event %p of pool %p\n", socket, event_strings[action], ev, pool);
-	}
+		{
+			static const char event_strings[][20] = {"NONE","TIMEOUT","READ","TIMEOUT|READ","WRITE","TIMEOUT|WRITE","READ|WRITE","TIMEOUT|READ|WRITE","SIGNAL"};
+			fprintf(stderr, "Event on socket %d (%s) event %p of pool %p\n", socket, event_strings[action], ev, pool);
+		}
 #endif
-	
-	/* don't use 'ev' below this loop as it might 've been freed in the socket callback */
-	do {
+		
+		/* don't use 'ev' below this loop as it might 've been freed in the socket callback */
+		do {
 #ifdef HAVE_CURL_MULTI_SOCKET_ACTION
-		switch (action & (EV_READ|EV_WRITE)) {
-			case EV_READ:
-				rc = curl_multi_socket_action(pool->ch, socket, CURL_CSELECT_IN, &pool->unfinished);
-				break;
-			case EV_WRITE:
-				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);
+			switch (action & (EV_READ|EV_WRITE)) {
+				case EV_READ:
+					rc = curl_multi_socket_action(pool->ch, socket, CURL_CSELECT_IN, &pool->unfinished);
+					break;
+				case EV_WRITE:
+					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->ch, socket, CURL_CSELECT_IN|CURL_CSELECT_OUT, &pool->unfinished);
+					break;
+				default:
+					http_error_ex(HE_WARNING, HTTP_E_SOCKET, "Unknown event %d", (int) action);
+					return;
+			}
+#else
+			rc = curl_multi_socket(pool->ch, socket, &pool->unfinished);
+#endif
+		} while (CURLM_CALL_MULTI_PERFORM == 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, "Unknown event %d", (int) action);
-				return;
+				http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc));
+				break;
 		}
-#else
-		rc = curl_multi_socket(pool->ch, socket, &pool->unfinished);
-#endif
-	} while (CURLM_CALL_MULTI_PERFORM == rc);
-	
-	if (CURLM_OK != rc) {
-		http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc));
-	}
-	
-	http_request_pool_responsehandler(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);
+		
+		http_request_pool_responsehandler(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);
+			fprintf(stderr, "Removed timeout of pool %p\n", pool);
 #endif
+		}
 	}
 }
 /* }}} */
@@ -531,53 +559,56 @@ static void http_request_pool_event_callback(int socket, short action, void *eve
 /* {{{ static int http_request_pool_socket_callback(CURL *, curl_socket_t, int, void *, void *) */
 static int http_request_pool_socket_callback(CURL *easy, curl_socket_t sock, int action, void *socket_data, void *assign_data)
 {
-	int events = EV_PERSIST;
 	http_request_pool *pool = socket_data;
-	http_request_pool_event *ev = assign_data;
-	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
-	
-	if (!ev) {
-		ev = ecalloc(1, sizeof(http_request_pool_event));
-		ev->pool = pool;
-		curl_multi_assign(pool->ch, sock, ev);
-	} else {
-		event_del(&ev->evnt);
-	}
 	
+	if (pool->useevents) {
+		int events = EV_PERSIST;
+		http_request_pool_event *ev = assign_data;
+		TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+		
+		if (!ev) {
+			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);
+		}
+		
 #if HTTP_DEBUG_REQPOOLS
-	{
-		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);
-	}
+		{
+			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 %2d (%8s) event %p of pool %p (%d)\n", (int) sock, action_strings[action], ev, pool, pool->unfinished);
+		}
 #endif
-	
-	switch (action) {
-		case CURL_POLL_IN:
-			events |= EV_READ;
-			break;
-		case CURL_POLL_OUT:
-			events |= EV_WRITE;
-			break;
-		case CURL_POLL_INOUT:
-			events |= EV_READ|EV_WRITE;
-			break;
-			
-		case CURL_POLL_REMOVE:
-			efree(ev);
-		case CURL_POLL_NONE:
-			return 0;
-			
-		default:
-			http_error_ex(HE_WARNING, HTTP_E_SOCKET, "Unknown socket action %d", action);
-			return -1;
+		
+		switch (action) {
+			case CURL_POLL_IN:
+				events |= EV_READ;
+				break;
+			case CURL_POLL_OUT:
+				events |= EV_WRITE;
+				break;
+			case CURL_POLL_INOUT:
+				events |= EV_READ|EV_WRITE;
+				break;
+				
+			case CURL_POLL_REMOVE:
+				efree(ev);
+			case CURL_POLL_NONE:
+				return 0;
+				
+			default:
+				http_error_ex(HE_WARNING, HTTP_E_SOCKET, "Unknown socket action %d", action);
+				return -1;
+		}
+		
+		event_set(&ev->evnt, sock, events, http_request_pool_event_callback, ev);
+		event_add(&ev->evnt, NULL);
 	}
 	
-	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);
-	
 	return 0;
 }
 /* }}} */
@@ -586,25 +617,31 @@ static int http_request_pool_socket_callback(CURL *easy, curl_socket_t sock, int
 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);
-	}
 	
-	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);
+	if (pool->useevents) {
+		TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+		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);
+		}
+		
+		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
 	}
-#if HTTP_DEBUG_REQPOOLS
-		else fprintf(stderr, "Removed timeout of pool %p\n", pool);
-#endif
 }
 /* }}} */
 #endif /* HTTP_HAVE_EVENT */