X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_requestpool_object.c;h=06733d2adbd918090ddef4f2559217608cead609;hp=dfb9c604f72f6d387f2209e491535f8a3abe1f74;hb=8ae4de63a85ad21442948aa35f45e28368c91929;hpb=712103ef11a9dfcc2495ce43e4a731d9b59d3439

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index dfb9c60..06733d2 100644
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -31,6 +28,10 @@
 #include "php_http_exception_object.h"
 
 #include "zend_interfaces.h"
+#if defined(HAVE_SPL) && !defined(WONKY)
+#	include "ext/spl/spl_array.h"
+#	include "ext/spl/spl_iterators.h"
+#endif
 
 #ifdef PHP_WIN32
 #	include <winsock2.h>
@@ -68,6 +69,11 @@ HTTP_EMPTY_ARGS(key, 0);
 HTTP_EMPTY_ARGS(next, 0);
 HTTP_EMPTY_ARGS(rewind, 0);
 
+HTTP_EMPTY_ARGS(count, 0);
+
+HTTP_EMPTY_ARGS(getAttachedRequests, 0);
+HTTP_EMPTY_ARGS(getFinishedRequests, 0);
+
 #define http_requestpool_object_declare_default_properties() _http_requestpool_object_declare_default_properties(TSRMLS_C)
 static inline void _http_requestpool_object_declare_default_properties(TSRMLS_D);
 
@@ -89,15 +95,28 @@ zend_function_entry http_requestpool_object_fe[] = {
 	HTTP_REQPOOL_ME(key, ZEND_ACC_PUBLIC)
 	HTTP_REQPOOL_ME(next, ZEND_ACC_PUBLIC)
 	HTTP_REQPOOL_ME(rewind, ZEND_ACC_PUBLIC)
+	
+	/* implmenents Countable */
+	HTTP_REQPOOL_ME(count, ZEND_ACC_PUBLIC)
+	
+	HTTP_REQPOOL_ME(getAttachedRequests, ZEND_ACC_PUBLIC)
+	HTTP_REQPOOL_ME(getFinishedRequests, ZEND_ACC_PUBLIC)
 
 	EMPTY_FUNCTION_ENTRY
 };
 static zend_object_handlers http_requestpool_object_handlers;
 
-void _http_requestpool_object_init(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(http_requestpool_object)
 {
 	HTTP_REGISTER_CLASS_EX(HttpRequestPool, http_requestpool_object, NULL, 0);
+#if defined(HAVE_SPL) && !defined(WONKY)
+	zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 2, spl_ce_Countable, spl_ce_Iterator);
+#else
 	zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 1, zend_ce_iterator);
+#endif
+
+	http_requestpool_object_handlers.clone_obj = NULL;
+	return SUCCESS;
 }
 
 zend_object_value _http_requestpool_object_new(zend_class_entry *ce TSRMLS_DC)
@@ -139,6 +158,13 @@ void _http_requestpool_object_free(zend_object *object TSRMLS_DC)
 	efree(o);
 }
 
+#define http_requestpool_object_llist2array _http_requestpool_object_llist2array
+static void _http_requestpool_object_llist2array(zval **req, zval *array TSRMLS_DC)
+{
+	ZVAL_ADDREF(*req);
+	add_next_index_zval(array, *req);
+}
+
 /* ### USERLAND ### */
 
 /* {{{ proto void HttpRequestPool::__construct([HttpRequest request[, ...]])
@@ -313,12 +339,27 @@ PHP_METHOD(HttpRequestPool, send)
  * Usage:
  * <pre>
  * <?php
- *     while ($pool->socketPerform()) {
- *         do_something_else();
- *         if (!$pool->socketSelect()) {
- *             die('Socket error');
+ * class MyPool extends HttpRequestPool
+ * {
+ *     public function send()
+ *     {
+ *         while ($this->socketPerform()) {
+ *             if (!$this->socketSelect()) {
+ *                 throw new HttpSocketExcpetion;
+ *             }
+ *         }
+ *     }
+ *     
+ *     protected final function socketPerform()
+ *     {
+ *         $result = parent::socketPerform();
+ *         foreach ($this->getFinishedRequests() as $r) {
+ *             $this->detach($r);
+ *             // handle response of finished request
  *         }
+ *         return $result;
  *     }
+ * } 
  * ?>
  * </pre>
  */
@@ -331,7 +372,6 @@ PHP_METHOD(HttpRequestPool, socketPerform)
 	if (0 < http_request_pool_perform(&obj->pool)) {
 		RETURN_TRUE;
 	} else {
-		zend_llist_apply(&obj->pool.handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC);
 		RETURN_FALSE;
 	}
 }
@@ -438,6 +478,60 @@ PHP_METHOD(HttpRequestPool, rewind)
 }
 /* }}} */
 
+/* {{{ proto int HttpRequestPool::count()
+ *
+ * Implements Countable.
+ * 
+ * Returns the number of attached HttpRequest objects.
+ */
+PHP_METHOD(HttpRequestPool, count)
+{
+	NO_ARGS {
+		getObject(http_requestpool_object, obj);
+		RETURN_LONG((long) zend_llist_count(&obj->pool.handles));
+	}
+}
+/* }}} */
+
+/* {{{ proto array HttpRequestPool::getAttachedRequests()
+ *
+ * Get attached HttpRequest objects.
+ * 
+ * Returns an array containing all currently attached HttpRequest objects.
+ */
+PHP_METHOD(HttpRequestPool, getAttachedRequests)
+{
+	getObject(http_requestpool_object, obj);
+	
+	NO_ARGS;
+	
+	array_init(return_value);
+	zend_llist_apply_with_argument(&obj->pool.handles, 
+		(llist_apply_with_arg_func_t) http_requestpool_object_llist2array, 
+		return_value TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto array HttpRequestPool::getFinishedRequests()
+ *
+ * Get attached HttpRequest objects that already have finished their work.
+ * 
+ * Returns an array containing all attached HttpRequest objects that
+ * already have finished their work.
+ */
+PHP_METHOD(HttpRequestPool, getFinishedRequests)
+{
+	getObject(http_requestpool_object, obj);
+	
+	NO_ARGS;
+		
+	array_init(return_value);
+	zend_llist_apply_with_argument(&obj->pool.finished,
+		(llist_apply_with_arg_func_t) http_requestpool_object_llist2array,
+		return_value TSRMLS_CC);
+}
+/* }}} */
+
 #endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */
 
 /*