X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_requestpool_object.c;h=3a0c0200af8cd46e5da65384739f35600ef52a32;hp=f9f463cb0888bcb7438e3747fca167c84e89c24b;hb=5dc71016d93c6e05fc9c6e933b934dfe9ab277fb;hpb=aa931f5b858c3d8513e883ae913f0704557ca540 diff --git a/http_requestpool_object.c b/http_requestpool_object.c index f9f463c..3a0c020 100644 --- a/http_requestpool_object.c +++ b/http_requestpool_object.c @@ -1,41 +1,39 @@ /* - +----------------------------------------------------------------------+ - | 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 | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | 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 | + +--------------------------------------------------------------------+ */ /* $Id$ */ - #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "php.h" + +#define HTTP_WANT_CURL +#include "php_http.h" #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) -#include "php_http_std_defs.h" +#include "zend_interfaces.h" + #include "php_http_api.h" -#include "php_http_requestpool_object.h" -#include "php_http_request_pool_api.h" -#include "php_http_request_object.h" #include "php_http_exception_object.h" +#include "php_http_request_api.h" +#include "php_http_request_object.h" +#include "php_http_request_pool_api.h" +#include "php_http_requestpool_object.h" -#include "zend_interfaces.h" - -#ifdef PHP_WIN32 -# include +#if defined(HAVE_SPL) && !defined(WONKY) +/* SPL doesn't install its headers */ +extern PHPAPI zend_class_entry *spl_ce_Countable; #endif -#include #define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpRequestPool, method, 0, req_args) #define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpRequestPool, method, ret_ref) @@ -68,13 +66,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); -HTTP_BEGIN_ARGS(setRequestOptions, 0) - HTTP_ARG_VAL(options, 0) -HTTP_END_ARGS; - #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); @@ -97,6 +93,9 @@ zend_function_entry http_requestpool_object_fe[] = { 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) @@ -107,7 +106,13 @@ static zend_object_handlers http_requestpool_object_handlers; 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, zend_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; } @@ -153,8 +158,7 @@ void _http_requestpool_object_free(zend_object *object TSRMLS_DC) #define http_requestpool_object_llist2array _http_requestpool_object_llist2array static void _http_requestpool_object_llist2array(zval **req, zval *array TSRMLS_DC) { - zval_add_ref(req); - zend_objects_store_add_ref(*req TSRMLS_CC); + ZVAL_ADDREF(*req); add_next_index_zval(array, *req); } @@ -337,20 +341,20 @@ PHP_METHOD(HttpRequestPool, send) * public function send() * { * while ($this->socketPerform()) { - * $this->handleRequests(); * if (!$this->socketSelect()) { * throw new HttpSocketExcpetion; * } * } - * $this->handleRequests(); * } * - * private function handleRequests() + * protected final function socketPerform() * { + * $result = parent::socketPerform(); * foreach ($this->getFinishedRequests() as $r) { * $this->detach($r); * // handle response of finished request * } + * return $result; * } * } * ?> @@ -471,6 +475,27 @@ 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); @@ -482,7 +507,15 @@ PHP_METHOD(HttpRequestPool, getAttachedRequests) (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); @@ -494,6 +527,7 @@ PHP_METHOD(HttpRequestPool, getFinishedRequests) (llist_apply_with_arg_func_t) http_requestpool_object_llist2array, return_value TSRMLS_CC); } +/* }}} */ #endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */