clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Speedup array/HashTable copying. (Matt W)

Browse Source
This commit is contained in:
Dmitry Stogov 2006-10-03 11:10:54 +00:00
parent 2027ceaa14
commit e8ddcf1077
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/zend_API.c
View File

@ -1221,7 +1221,7 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC
#else
ALLOC_HASHTABLE(class_type->static_members);
#endif
zend_u_hash_init(CE_STATIC_MEMBERS(class_type), 0, NULL, ZVAL_PTR_DTOR, 0, UG(unicode));
zend_u_hash_init(CE_STATIC_MEMBERS(class_type), zend_hash_num_elements(&class_type->default_static_members), NULL, ZVAL_PTR_DTOR, 0, UG(unicode));
zend_hash_internal_pointer_reset_ex(&class_type->default_static_members, &pos);
while (zend_hash_get_current_data_ex(&class_type->default_static_members, (void**)&p, &pos) == SUCCESS) {
@ -1291,7 +1291,7 @@ ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type
object->properties = properties;
} else {
ALLOC_HASHTABLE_REL(object->properties);
zend_u_hash_init(object->properties, 0, NULL, ZVAL_PTR_DTOR, 0, UG(unicode));
zend_u_hash_init(object->properties, zend_hash_num_elements(&class_type->default_properties), NULL, ZVAL_PTR_DTOR, 0, UG(unicode));
zend_hash_copy(object->properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
}
} else {

2
Zend/zend_compile.c
View File

@ -1926,7 +1926,7 @@ ZEND_API void function_add_ref(zend_function *function TSRMLS_DC)
zval *tmp_zval;
ALLOC_HASHTABLE(op_array->static_variables);
zend_u_hash_init(op_array->static_variables, 2, NULL, ZVAL_PTR_DTOR, 0, UG(unicode));
zend_u_hash_init(op_array->static_variables, zend_hash_num_elements(static_variables), NULL, ZVAL_PTR_DTOR, 0, UG(unicode));
zend_hash_copy(op_array->static_variables, static_variables, (copy_ctor_func_t) zval_add_ref, (void *) &tmp_zval, sizeof(zval *));
}
}

2
Zend/zend_variables.c
View File

@ -157,7 +157,7 @@ copy_unicode:
return; /* do nothing */
}
ALLOC_HASHTABLE_REL(tmp_ht);
zend_u_hash_init(tmp_ht, 0, NULL, ZVAL_PTR_DTOR, 0, original_ht->unicode);
zend_u_hash_init(tmp_ht, zend_hash_num_elements(original_ht), NULL, ZVAL_PTR_DTOR, 0, original_ht->unicode);
zend_hash_copy(tmp_ht, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
Z_ARRVAL_P(zvalue) = tmp_ht;
}