X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=337d15023ec6476ddd171c5edd76af8103f93e96;hp=aee2d89a29c6ef92fb18796434b029ddbd0ef2ea;hb=c60c46e6a6f5c3e4bed253a2a1b893a53e26bbfc;hpb=ea76053f1595a10c79735e36a51f54478ff15acf

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index aee2d89..337d150 100644
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -36,7 +36,10 @@ typedef struct _http_request_pool_event_t {
 	http_request_pool *pool;
 } http_request_pool_event;
 
+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);
@@ -84,8 +87,11 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool
 	TSRMLS_SET_CTX(pool->tsrm_ls);
 	
 #if 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);
+	curl_multi_setopt(pool->ch, CURLMOPT_TIMERDATA, pool);
+	curl_multi_setopt(pool->ch, CURLMOPT_TIMERFUNCTION, http_request_pool_timer_callback);
 #endif
 	
 	pool->unfinished = 0;
@@ -116,15 +122,21 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 		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
@@ -246,45 +258,40 @@ PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool)
 PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool)
 {
 	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
-#ifdef HTTP_HAVE_EVENT
-	CURLMcode rc;
 	
-	do {
-		rc = curl_multi_socket_all(pool->ch, &pool->unfinished);
-	} while (CURLM_CALL_MULTI_PERFORM == rc);
-	
-	if (CURLM_OK != rc) {
-		http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc));
-		return FAILURE;
-	}
-	
-	event_base_dispatch(HTTP_G->request.pool.event.base);
+#if HTTP_DEBUG_REQPOOLS
+	fprintf(stderr, "Attempt to send %d requests of pool %p\n", zend_llist_count(&pool->handles), pool);
+#endif
 	
-	return SUCCESS;
+#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));
+			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
-	
-#	if HTTP_DEBUG_REQPOOLS
-	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 (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;
+			}
 		}
 	}
 	
-#	if HTTP_DEBUG_REQPOOLS
+#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);
-#	endif
+#endif
 	
 	return SUCCESS;
-#endif
 }
 /* }}} */
 
@@ -297,6 +304,10 @@ 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
+	efree(pool->timeout);
+#endif
+	
 	pool->unfinished = 0;
 	zend_llist_clean(&pool->finished);
 	zend_llist_clean(&pool->handles);
@@ -313,23 +324,20 @@ 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)
 {
-#ifdef HTTP_HAVE_EVENT
-	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
-	http_error(HE_WARNING, HTTP_E_RUNTIME, "not implemented");
-	return FAILURE;
-#else
 	int MAX;
 	fd_set R, W, E;
-	struct timeval timeout = {1, 0};
-#	ifdef HAVE_CURL_MULTI_TIMEOUT
-	long max_tout = 1000;
-	
-	if ((CURLM_OK == curl_multi_timeout(pool->ch, &max_tout)) && (max_tout != -1)) {
-		timeout.tv_sec = max_tout / 1000;
-		timeout.tv_usec = (max_tout % 1000) * 1000;
-	}
-#	endif
+	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);
 	FD_ZERO(&W);
 	FD_ZERO(&E);
@@ -343,7 +351,6 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
 		}
 	}
 	return FAILURE;
-#endif
 }
 /* }}} */
 
@@ -351,33 +358,49 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
 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");
-	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));
 	
-	while ((msg = curl_multi_info_read(pool->ch, &remaining))) {
-		if (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_pool_apply_with_arg(pool, _http_request_pool_responsehandler, msg->easy_handle);
-		}
-	}
+#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
 }
 /* }}} */
 
-/* {{{ void http_request_pool_responsehandler(http_request_pool *, zval *, void *) */
-int _http_request_pool_responsehandler(http_request_pool *pool, zval *req, void *ch)
+/* {{{ void http_request_pool_responsehandler(http_request_pool *) */
+void _http_request_pool_responsehandler(http_request_pool *pool)
+{
+	CURLMsg *msg;
+	int remaining = 0;
+	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+	
+	do {
+		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_pool_apply_with_arg(pool, _http_request_pool_apply_responsehandler, msg->easy_handle);
+		}
+	} while (remaining);
+}
+/* }}} */
+
+/* {{{ 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)
 {
 	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
 	getObjectEx(http_request_object, obj, req);
@@ -397,6 +420,31 @@ int _http_request_pool_responsehandler(http_request_pool *pool, zval *req, void
 }
 /* }}} */
 
+/* {{{ struct timeval *_http_request_pool_timeout(http_request_pool *, struct timeval *) */
+struct timeval *_http_request_pool_timeout(http_request_pool *pool, struct timeval *timeout)
+{
+#ifdef HAVE_CURL_MULTI_TIMEOUT
+	long max_tout = 1000;
+	
+	if ((CURLM_OK == curl_multi_timeout(pool->ch, &max_tout)) && (max_tout != -1)) {
+		timeout->tv_sec = max_tout / 1000;
+		timeout->tv_usec = (max_tout % 1000) * 1000;
+	} else {
+#endif
+		timeout->tv_sec = 1;
+		timeout->tv_usec = 0;
+#ifdef HAVE_CURL_MULTI_TIMEOUT
+	}
+#endif
+	
+#if HTTP_DEBUG_REQPOOLS
+	fprintf(stderr, "Calculating timeout (%lu, %lu) of pool %p\n", (ulong) timeout->tv_sec, (ulong) timeout->tv_usec, pool);
+#endif
+	
+	return timeout;
+}
+/* }}} */
+
 /*#*/
 
 /* {{{ static int http_request_pool_compare_handles(void *, void *) */
@@ -407,22 +455,43 @@ static int http_request_pool_compare_handles(void *h1, void *h2)
 /* }}} */
 
 #ifdef HTTP_HAVE_EVENT
-static void http_request_pool_event_callback(int socket, short action, void *event_data)
+/* {{{ 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;
-	CURLMsg *msg;
-	int remaining;
+	http_request_pool *pool = event_data;
+	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+	
+#if HTTP_DEBUG_REQPOOLS
+	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));
+	}
+	
+	http_request_pool_timer_callback(pool->ch, 1000, pool);
+}
+/* }}} */
+
+/* {{{ 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 HTTP_DEBUG_REQPOOLS
 	{
-		static const char event_strings[][20] = {"TIMEOUT","READ","TIMEOUT|READ","WRITE","TIMEOUT|WRITE","READ|WRITE","TIMEOUT|READ|WRITE","SIGNAL"};
+		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 {
 #ifdef HAVE_CURL_MULTI_SOCKET_ACTION
 		switch (action & (EV_READ|EV_WRITE)) {
@@ -433,10 +502,10 @@ static void http_request_pool_event_callback(int socket, short action, void *eve
 				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
@@ -444,24 +513,23 @@ static void http_request_pool_event_callback(int socket, short action, void *eve
 #endif
 	} while (CURLM_CALL_MULTI_PERFORM == rc);
 	
-	/* don't use 'ev' below here, as it might 've been freed in the socket callback */
-	
 	if (CURLM_OK != rc) {
 		http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc));
 	}
 	
-	while ((msg = curl_multi_info_read(pool->ch, &remaining))) {
-		if (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_pool_apply_with_arg(pool, _http_request_pool_responsehandler, msg->easy_handle);
-		}
+	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);
+#endif
 	}
 }
+/* }}} */
 
+/* {{{ 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;
@@ -480,7 +548,9 @@ static int http_request_pool_socket_callback(CURL *easy, curl_socket_t sock, int
 #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
 	
@@ -511,6 +581,28 @@ static int http_request_pool_socket_callback(CURL *easy, curl_socket_t sock, int
 	
 	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 */