iliaa Tue Oct 3 19:52:34 2006 UTC
Modified files:
/php-src/ext/soap php_schema.c soap.c
/php-src/ext/sockets sockets.c
/php-src/main/streams filter.c streams.c
Log:
MFB: Last set of zend_hash_init() optimizations
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_schema.c?r1=1.67&r2=1.68&diff_format=u
Index: php-src/ext/soap/php_schema.c
diff -u php-src/ext/soap/php_schema.c:1.67 php-src/ext/soap/php_schema.c:1.68
--- php-src/ext/soap/php_schema.c:1.67 Thu Jul 13 16:47:25 2006
+++ php-src/ext/soap/php_schema.c Tue Oct 3 19:52:34 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_schema.c,v 1.67 2006/07/13 16:47:25 dmitry Exp $ */
+/* $Id: php_schema.c,v 1.68 2006/10/03 19:52:34 iliaa Exp $ */
#include "php_soap.h"
#include "libxml/uri.h"
@@ -2039,7 +2039,7 @@
xmlNodePtr node;
attr->extraAttributes =
emalloc(sizeof(HashTable));
- zend_hash_init(attr->extraAttributes,
0, NULL, delete_extra_attribute, 0);
+ zend_hash_init(attr->extraAttributes,
zend_hash_num_elements((*tmp)->extraAttributes), NULL, delete_extra_attribute,
0);
zend_hash_copy(attr->extraAttributes,
(*tmp)->extraAttributes, copy_extra_attribute, &node, sizeof(xmlNodePtr));
}
attr->encode = (*tmp)->encode;
@@ -2085,7 +2085,7 @@
if
(newAttr->extraAttributes) {
xmlNodePtr node;
HashTable *ht =
emalloc(sizeof(HashTable));
-
zend_hash_init(ht, 0, NULL, delete_extra_attribute, 0);
+
zend_hash_init(ht, zend_hash_num_elements(newAttr->extraAttributes), NULL,
delete_extra_attribute, 0);
zend_hash_copy(ht, newAttr->extraAttributes, copy_extra_attribute, &node,
sizeof(xmlNodePtr));
newAttr->extraAttributes = ht;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.213&r2=1.214&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.213 php-src/ext/soap/soap.c:1.214
--- php-src/ext/soap/soap.c:1.213 Mon Sep 25 21:16:51 2006
+++ php-src/ext/soap/soap.c Tue Oct 3 19:52:34 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.213 2006/09/25 21:16:51 bjori Exp $ */
+/* $Id: soap.c,v 1.214 2006/10/03 19:52:34 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1366,7 +1366,7 @@
zval *ztmp;
ALLOC_HASHTABLE(service->class_map);
- zend_u_hash_init(service->class_map, 0, NULL,
ZVAL_PTR_DTOR, 0, UG(unicode));
+ zend_u_hash_init(service->class_map,
zend_hash_num_elements((*tmp)->value.ht), NULL, ZVAL_PTR_DTOR, 0, UG(unicode));
zend_hash_copy(service->class_map, (*tmp)->value.ht,
(copy_ctor_func_t) zval_add_ref, (void *) &ztmp, sizeof(zval *));
}
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.182&r2=1.183&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.182 php-src/ext/sockets/sockets.c:1.183
--- php-src/ext/sockets/sockets.c:1.182 Thu Aug 31 16:14:43 2006
+++ php-src/ext/sockets/sockets.c Tue Oct 3 19:52:34 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.182 2006/08/31 16:14:43 tony2001 Exp $ */
+/* $Id: sockets.c,v 1.183 2006/10/03 19:52:34 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -566,7 +566,7 @@
if (Z_TYPE_P(sock_array) != IS_ARRAY) return 0;
ALLOC_HASHTABLE(new_hash);
- zend_hash_init(new_hash, 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_init(new_hash,
zend_hash_num_elements(Z_ARRVAL_P(sock_array)), NULL, ZVAL_PTR_DTOR, 0);
for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(sock_array));
zend_hash_get_current_data(Z_ARRVAL_P(sock_array), (void **)
&element) == SUCCESS;
zend_hash_move_forward(Z_ARRVAL_P(sock_array))) {
http://cvs.php.net/viewvc.cgi/php-src/main/streams/filter.c?r1=1.35&r2=1.36&diff_format=u
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.35 php-src/main/streams/filter.c:1.36
--- php-src/main/streams/filter.c:1.35 Tue Sep 19 10:38:31 2006
+++ php-src/main/streams/filter.c Tue Oct 3 19:52:34 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.35 2006/09/19 10:38:31 dmitry Exp $ */
+/* $Id: filter.c,v 1.36 2006/10/03 19:52:34 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -61,7 +61,7 @@
php_stream_filter_factory tmpfactory;
ALLOC_HASHTABLE(FG(stream_filters));
- zend_hash_init(FG(stream_filters), 0, NULL, NULL, 1);
+ zend_hash_init(FG(stream_filters),
zend_hash_num_elements(&stream_filters_hash), NULL, NULL, 1);
zend_hash_copy(FG(stream_filters), &stream_filters_hash, NULL,
&tmpfactory, sizeof(php_stream_filter_factory));
}
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.137&r2=1.138&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.137
php-src/main/streams/streams.c:1.138
--- php-src/main/streams/streams.c:1.137 Sun Sep 24 20:33:14 2006
+++ php-src/main/streams/streams.c Tue Oct 3 19:52:34 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.137 2006/09/24 20:33:14 pollita Exp $ */
+/* $Id: streams.c,v 1.138 2006/10/03 19:52:34 iliaa Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -2010,7 +2010,7 @@
php_stream_wrapper *tmp;
ALLOC_HASHTABLE(FG(stream_wrappers));
- zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
+ zend_hash_init(FG(stream_wrappers),
zend_hash_num_elements(&url_stream_wrappers_hash), NULL, NULL, 1);
zend_hash_copy(FG(stream_wrappers), &url_stream_wrappers_hash, NULL,
&tmp, sizeof(tmp));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
