diff options
author | Dmitry Stogov <dmitry@php.net> | 2010-05-24 14:11:39 +0000 |
---|---|---|
committer | Dmitry Stogov <dmitry@php.net> | 2010-05-24 14:11:39 +0000 |
commit | c5237d82bf01a762bb38f80def59b9c16cb84dc1 (patch) | |
tree | 6e769820ba97ef669765c6ecfeabb08faf9e6ebc /Zend/zend_objects.c | |
parent | 1cabc8cd3a3bf5c12a8ece9efb59e3f5381f1ae5 (diff) | |
download | php-git-c5237d82bf01a762bb38f80def59b9c16cb84dc1.tar.gz |
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
Diffstat (limited to 'Zend/zend_objects.c')
-rw-r--r-- | Zend/zend_objects.c | 66 |
1 files changed, 58 insertions, 8 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index a2f1d3287e..6a87284ced 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -28,10 +28,9 @@ ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSRMLS_DC) { - ALLOC_HASHTABLE(object->properties); - zend_hash_init(object->properties, 0, NULL, ZVAL_PTR_DTOR, 0); - object->ce = ce; + object->properties = NULL; + object->properties_table = NULL; object->guards = NULL; } @@ -44,6 +43,18 @@ ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC) if (object->properties) { zend_hash_destroy(object->properties); FREE_HASHTABLE(object->properties); + if (object->properties_table) { + efree(object->properties_table); + } + } else if (object->properties_table) { + int i; + + for (i = 0; i < object->ce->default_properties_count; i++) { + if (object->properties_table[i]) { + zval_ptr_dtor(&object->properties_table[i]); + } + } + efree(object->properties_table); } } @@ -135,9 +146,11 @@ ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_ent *object = emalloc(sizeof(zend_object)); (*object)->ce = class_type; + (*object)->properties = NULL; + (*object)->properties_table = NULL; + (*object)->guards = NULL; retval.handle = zend_objects_store_put(*object, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) zend_objects_free_object_storage, NULL TSRMLS_CC); retval.handlers = &std_object_handlers; - (*object)->guards = NULL; return retval; } @@ -148,7 +161,47 @@ ZEND_API zend_object *zend_objects_get_address(const zval *zobject TSRMLS_DC) ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object_value new_obj_val, zend_object *old_object, zend_object_handle handle TSRMLS_DC) { - zend_hash_copy(new_object->properties, old_object->properties, (copy_ctor_func_t) zval_add_ref, (void *) NULL /* Not used anymore */, sizeof(zval *)); + int i; + + if (old_object->properties_table) { + if (!new_object->properties_table) { + new_object->properties_table = emalloc(sizeof(zval*) * old_object->ce->default_properties_count); + memset(new_object->properties_table, 0, sizeof(zval*) * old_object->ce->default_properties_count); + } + for (i = 0; i < old_object->ce->default_properties_count; i++) { + if (!new_object->properties) { + if (new_object->properties_table[i]) { + zval_ptr_dtor(&new_object->properties_table[i]); + } + } + if (!old_object->properties) { + new_object->properties_table[i] = old_object->properties_table[i]; + if (new_object->properties_table[i]) { + Z_ADDREF_P(new_object->properties_table[i]); + } + } + } + } + if (old_object->properties) { + if (!new_object->properties) { + ALLOC_HASHTABLE(new_object->properties); + zend_hash_init(new_object->properties, 0, NULL, ZVAL_PTR_DTOR, 0); + } + zend_hash_copy(new_object->properties, old_object->properties, (copy_ctor_func_t) zval_add_ref, (void *) NULL /* Not used anymore */, sizeof(zval *)); + if (old_object->properties_table) { + HashPosition pos; + zend_property_info *prop_info; + for (zend_hash_internal_pointer_reset_ex(&old_object->ce->properties_info, &pos); + zend_hash_get_current_data_ex(&old_object->ce->properties_info, (void**)&prop_info, &pos) == SUCCESS; + zend_hash_move_forward_ex(&old_object->ce->properties_info, &pos)) { + if ((prop_info->flags & ZEND_ACC_STATIC) == 0) { + if (zend_hash_quick_find(new_object->properties, prop_info->name, prop_info->name_length+1, prop_info->h, (void**)&new_object->properties_table[prop_info->offset]) == FAILURE) { + new_object->properties_table[prop_info->offset] = NULL; + } + } + } + } + } if (old_object->ce->clone) { zval *new_obj; @@ -176,9 +229,6 @@ ZEND_API zend_object_value zend_objects_clone_obj(zval *zobject TSRMLS_DC) old_object = zend_objects_get_address(zobject TSRMLS_CC); new_obj_val = zend_objects_new(&new_object, old_object->ce TSRMLS_CC); - ALLOC_HASHTABLE(new_object->properties); - zend_hash_init(new_object->properties, 0, NULL, ZVAL_PTR_DTOR, 0); - zend_objects_clone_members(new_object, new_obj_val, old_object, handle TSRMLS_CC); return new_obj_val; |