com php-src: Micro optimizations: Zend/zend_interfaces.c ext/spl/spl_array.c ext/spl/spl_fixedarray.c ext/sp l/spl_iterators.c

From: Date: Wed, 17 Oct 2018 13:55:52 +0000
Subject: com php-src: Micro optimizations: Zend/zend_interfaces.c ext/spl/spl_array.c ext/spl/spl_fixedarray.c ext/sp l/spl_iterators.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-103491@lists.php.net to get a copy of this message
Commit: 3575a2b8f921b2c7af9a725e54a1391243a71378 Author: Dmitry Stogov <dmitry@zend.com> Wed, 17 Oct 2018 16:55:52 +0300 Parents: 9226695c221dc6e0a66ff03964f0bfae02477d69 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3575a2b8f921b2c7af9a725e54a1391243a71378 Log: Micro optimizations Changed paths: M Zend/zend_interfaces.c M ext/spl/spl_array.c M ext/spl/spl_fixedarray.c M ext/spl/spl_iterators.c

diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index 2e7f70c..1fe5434 100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -312,6 +312,7 @@ static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entr { uint32_t i; int t = -1; + zend_class_iterator_funcs *funcs_ptr; if (class_type->get_iterator) { if (class_type->type == ZEND_INTERNAL_CLASS) { @@ -340,16 +341,21 @@ static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entr } } class_type->get_iterator = zend_user_it_get_new_iterator; - if (class_type->iterator_funcs_ptr != NULL) { - class_type->iterator_funcs_ptr->zf_new_iterator = NULL; - } else if (class_type->type == ZEND_INTERNAL_CLASS) { - class_type->iterator_funcs_ptr = calloc(1, sizeof(zend_class_iterator_funcs)); - } else { - class_type->iterator_funcs_ptr = zend_arena_alloc(&CG(arena), sizeof(zend_class_iterator_funcs)); - memset(class_type->iterator_funcs_ptr, 0, sizeof(zend_class_iterator_funcs)); - } + funcs_ptr = class_type->iterator_funcs_ptr; if (class_type->type == ZEND_INTERNAL_CLASS) { - class_type->iterator_funcs_ptr->zf_new_iterator = zend_hash_str_find_ptr(&class_type->function_table, "getiterator", sizeof("getiterator") - 1); + if (!funcs_ptr) { + funcs_ptr = calloc(1, sizeof(zend_class_iterator_funcs)); + class_type->iterator_funcs_ptr = funcs_ptr; + } + funcs_ptr->zf_new_iterator = zend_hash_str_find_ptr(&class_type->function_table, "getiterator", sizeof("getiterator") - 1); + } else { + if (!funcs_ptr) { + funcs_ptr = zend_arena_alloc(&CG(arena), sizeof(zend_class_iterator_funcs)); + class_type->iterator_funcs_ptr = funcs_ptr; + memset(funcs_ptr, 0, sizeof(zend_class_iterator_funcs)); + } else { + funcs_ptr->zf_new_iterator = NULL; + } } return SUCCESS; } @@ -358,6 +364,8 @@ static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entr /* {{{ zend_implement_iterator */ static int zend_implement_iterator(zend_class_entry *interface, zend_class_entry *class_type) { + zend_class_iterator_funcs *funcs_ptr; + if (class_type->get_iterator && class_type->get_iterator != zend_user_it_get_iterator) { if (class_type->type == ZEND_INTERNAL_CLASS) { /* inheritance ensures the class has the necessary userland methods */ @@ -374,24 +382,30 @@ static int zend_implement_iterator(zend_class_entry *interface, zend_class_entry } } class_type->get_iterator = zend_user_it_get_iterator; - if (class_type->iterator_funcs_ptr != NULL) { - class_type->iterator_funcs_ptr->zf_valid = NULL; - class_type->iterator_funcs_ptr->zf_current = NULL; - class_type->iterator_funcs_ptr->zf_key = NULL; - class_type->iterator_funcs_ptr->zf_next = NULL; - class_type->iterator_funcs_ptr->zf_rewind = NULL; - } else if (class_type->type == ZEND_INTERNAL_CLASS) { - class_type->iterator_funcs_ptr = calloc(1, sizeof(zend_class_iterator_funcs)); - } else { - class_type->iterator_funcs_ptr = zend_arena_alloc(&CG(arena), sizeof(zend_class_iterator_funcs)); - memset(class_type->iterator_funcs_ptr, 0, sizeof(zend_class_iterator_funcs)); - } + funcs_ptr = class_type->iterator_funcs_ptr; if (class_type->type == ZEND_INTERNAL_CLASS) { - class_type->iterator_funcs_ptr->zf_rewind = zend_hash_str_find_ptr(&class_type->function_table, "rewind", sizeof("rewind") - 1); - class_type->iterator_funcs_ptr->zf_valid = zend_hash_str_find_ptr(&class_type->function_table, "valid", sizeof("valid") - 1); - class_type->iterator_funcs_ptr->zf_key = zend_hash_str_find_ptr(&class_type->function_table, "key", sizeof("key") - 1); - class_type->iterator_funcs_ptr->zf_current = zend_hash_str_find_ptr(&class_type->function_table, "current", sizeof("current") - 1); - class_type->iterator_funcs_ptr->zf_next = zend_hash_str_find_ptr(&class_type->function_table, "next", sizeof("next") - 1); + if (!funcs_ptr) { + funcs_ptr = calloc(1, sizeof(zend_class_iterator_funcs)); + class_type->iterator_funcs_ptr = funcs_ptr; + } else { + funcs_ptr->zf_rewind = zend_hash_str_find_ptr(&class_type->function_table, "rewind", sizeof("rewind") - 1); + funcs_ptr->zf_valid = zend_hash_str_find_ptr(&class_type->function_table, "valid", sizeof("valid") - 1); + funcs_ptr->zf_key = zend_hash_str_find_ptr(&class_type->function_table, "key", sizeof("key") - 1); + funcs_ptr->zf_current = zend_hash_str_find_ptr(&class_type->function_table, "current", sizeof("current") - 1); + funcs_ptr->zf_next = zend_hash_str_find_ptr(&class_type->function_table, "next", sizeof("next") - 1); + } + } else { + if (!funcs_ptr) { + funcs_ptr = zend_arena_alloc(&CG(arena), sizeof(zend_class_iterator_funcs)); + class_type->iterator_funcs_ptr = funcs_ptr; + memset(funcs_ptr, 0, sizeof(zend_class_iterator_funcs)); + } else { + funcs_ptr->zf_valid = NULL; + funcs_ptr->zf_current = NULL; + funcs_ptr->zf_key = NULL; + funcs_ptr->zf_next = NULL; + funcs_ptr->zf_rewind = NULL; + } } return SUCCESS; } diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 04e73bf..b341b8a 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -243,19 +243,21 @@ static zend_object *spl_array_object_new_ex(zend_class_entry *class_type, zval * /* Cache iterator functions if ArrayIterator or derived. Check current's */ /* cache since only current is always required */ if (intern->std.handlers == &spl_handler_ArrayIterator) { - if (!class_type->iterator_funcs_ptr->zf_current) { - class_type->iterator_funcs_ptr->zf_rewind = zend_hash_str_find_ptr(&class_type->function_table, "rewind", sizeof("rewind") - 1); - class_type->iterator_funcs_ptr->zf_valid = zend_hash_str_find_ptr(&class_type->function_table, "valid", sizeof("valid") - 1); - class_type->iterator_funcs_ptr->zf_key = zend_hash_str_find_ptr(&class_type->function_table, "key", sizeof("key") - 1); - class_type->iterator_funcs_ptr->zf_current = zend_hash_str_find_ptr(&class_type->function_table, "current", sizeof("current") - 1); - class_type->iterator_funcs_ptr->zf_next = zend_hash_str_find_ptr(&class_type->function_table, "next", sizeof("next") - 1); + zend_class_iterator_funcs *funcs_ptr = class_type->iterator_funcs_ptr; + + if (!funcs_ptr->zf_current) { + funcs_ptr->zf_rewind = zend_hash_str_find_ptr(&class_type->function_table, "rewind", sizeof("rewind") - 1); + funcs_ptr->zf_valid = zend_hash_str_find_ptr(&class_type->function_table, "valid", sizeof("valid") - 1); + funcs_ptr->zf_key = zend_hash_str_find_ptr(&class_type->function_table, "key", sizeof("key") - 1); + funcs_ptr->zf_current = zend_hash_str_find_ptr(&class_type->function_table, "current", sizeof("current") - 1); + funcs_ptr->zf_next = zend_hash_str_find_ptr(&class_type->function_table, "next", sizeof("next") - 1); } if (inherited) { - if (class_type->iterator_funcs_ptr->zf_rewind->common.scope != parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_REWIND; - if (class_type->iterator_funcs_ptr->zf_valid->common.scope != parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_VALID; - if (class_type->iterator_funcs_ptr->zf_key->common.scope != parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_KEY; - if (class_type->iterator_funcs_ptr->zf_current->common.scope != parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_CURRENT; - if (class_type->iterator_funcs_ptr->zf_next->common.scope != parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_NEXT; + if (funcs_ptr->zf_rewind->common.scope != parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_REWIND; + if (funcs_ptr->zf_valid->common.scope != parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_VALID; + if (funcs_ptr->zf_key->common.scope != parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_KEY; + if (funcs_ptr->zf_current->common.scope != parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_CURRENT; + if (funcs_ptr->zf_next->common.scope != parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_NEXT; } } diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 392175f..5da70aa 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -207,6 +207,7 @@ static zend_object *spl_fixedarray_object_new_ex(zend_class_entry *class_type, z spl_fixedarray_object *intern; zend_class_entry *parent = class_type; int inherited = 0; + zend_class_iterator_funcs *funcs_ptr; intern = zend_object_alloc(sizeof(spl_fixedarray_object), parent); @@ -238,27 +239,28 @@ static zend_object *spl_fixedarray_object_new_ex(zend_class_entry *class_type, z php_error_docref(NULL, E_COMPILE_ERROR, "Internal compiler error, Class is not child of SplFixedArray"); } - if (!class_type->iterator_funcs_ptr->zf_current) { - class_type->iterator_funcs_ptr->zf_rewind = zend_hash_str_find_ptr(&class_type->function_table, "rewind", sizeof("rewind") - 1); - class_type->iterator_funcs_ptr->zf_valid = zend_hash_str_find_ptr(&class_type->function_table, "valid", sizeof("valid") - 1); - class_type->iterator_funcs_ptr->zf_key = zend_hash_str_find_ptr(&class_type->function_table, "key", sizeof("key") - 1); - class_type->iterator_funcs_ptr->zf_current = zend_hash_str_find_ptr(&class_type->function_table, "current", sizeof("current") - 1); - class_type->iterator_funcs_ptr->zf_next = zend_hash_str_find_ptr(&class_type->function_table, "next", sizeof("next") - 1); + funcs_ptr = class_type->iterator_funcs_ptr; + if (!funcs_ptr->zf_current) { + funcs_ptr->zf_rewind = zend_hash_str_find_ptr(&class_type->function_table, "rewind", sizeof("rewind") - 1); + funcs_ptr->zf_valid = zend_hash_str_find_ptr(&class_type->function_table, "valid", sizeof("valid") - 1); + funcs_ptr->zf_key = zend_hash_str_find_ptr(&class_type->function_table, "key", sizeof("key") - 1); + funcs_ptr->zf_current = zend_hash_str_find_ptr(&class_type->function_table, "current", sizeof("current") - 1); + funcs_ptr->zf_next = zend_hash_str_find_ptr(&class_type->function_table, "next", sizeof("next") - 1); } if (inherited) { - if (class_type->iterator_funcs_ptr->zf_rewind->common.scope != parent) { + if (funcs_ptr->zf_rewind->common.scope != parent) { intern->flags |= SPL_FIXEDARRAY_OVERLOADED_REWIND; } - if (class_type->iterator_funcs_ptr->zf_valid->common.scope != parent) { + if (funcs_ptr->zf_valid->common.scope != parent) { intern->flags |= SPL_FIXEDARRAY_OVERLOADED_VALID; } - if (class_type->iterator_funcs_ptr->zf_key->common.scope != parent) { + if (funcs_ptr->zf_key->common.scope != parent) { intern->flags |= SPL_FIXEDARRAY_OVERLOADED_KEY; } - if (class_type->iterator_funcs_ptr->zf_current->common.scope != parent) { + if (funcs_ptr->zf_current->common.scope != parent) { intern->flags |= SPL_FIXEDARRAY_OVERLOADED_CURRENT; } - if (class_type->iterator_funcs_ptr->zf_next->common.scope != parent) { + if (funcs_ptr->zf_next->common.scope != parent) { intern->flags |= SPL_FIXEDARRAY_OVERLOADED_NEXT; } diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 40fa9f3..97a47d0 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -1346,19 +1346,6 @@ static const zend_function_entry spl_funcs_RecursiveTreeIterator[] = { PHP_FE_END }; -#if MBO_0 -static int spl_dual_it_gets_implemented(zend_class_entry *interface, zend_class_entry *class_type) -{ - class_type->iterator_funcs_ptr->zf_valid = NULL; - class_type->iterator_funcs_ptr->zf_current = NULL; - class_type->iterator_funcs_ptr->zf_key = NULL; - class_type->iterator_funcs_ptr->zf_next = NULL; - class_type->iterator_funcs_ptr->zf_rewind = NULL; - - return SUCCESS; -} -#endif - static zend_function *spl_dual_it_get_method(zend_object **object, zend_string *method, const zval *key) { zend_function *function_handler;
« previous php.cvs (#103491) next »