X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=missing.c;h=3e7dbfabb1c2cff7a3940b4f0d55c5eb105a2bda;hp=102fb4f7540d8c023d592baad33f91176e5e330e;hb=1b093720ee0708c101a273e739ddb774f7d7f6d0;hpb=7750286b889f7d265a5363546b9bfc5b58246277 diff --git a/missing.c b/missing.c index 102fb4f..3e7dbfa 100644 --- a/missing.c +++ b/missing.c @@ -18,16 +18,11 @@ #include "php.h" #include "missing.h" -#ifdef ZEND_ENGINE_2 +#if PHP_MAJOR_VERSION == 5 -static inline zval *new_zval(zend_class_entry *ce) +static inline zval *new_zval(int persistent) { - zval *z; - if (ce->type & ZEND_INTERNAL_CLASS) { - z = malloc(sizeof(zval)); - } else { - ALLOC_ZVAL(z); - } + zval *z = pemalloc(sizeof(zval), persistent); INIT_PZVAL(z); return z; } @@ -41,11 +36,18 @@ static inline zval *tmp_zval(void) return z; } +static void dup_zval(zval **z) +{ + zval_add_ref(z); + SEPARATE_ZVAL(z); +} + + +# if PHP_MINOR_VERSION == 0 -#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0) int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC) { - zval *property = new_zval(ce); + zval *property = new_zval(ce->type & ZEND_INTERNAL_CLASS); ZVAL_DOUBLE(property, value); return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); } @@ -59,7 +61,7 @@ void zend_update_property_double(zend_class_entry *scope, zval *object, char *na int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC) { - zval *property = new_zval(ce); + zval *property = new_zval(ce->type & ZEND_INTERNAL_CLASS); ZVAL_BOOL(property, value); return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); } @@ -71,9 +73,7 @@ void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); } -#endif - -#if (PHP_MAJOR_VERSION >= 5) +# endif /* PHP_MINOR_VERSION == 0 */ int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_length, zval *value TSRMLS_DC) { @@ -82,21 +82,21 @@ int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_le int zend_declare_class_constant_long(zend_class_entry *ce, char *name, size_t name_length, long value TSRMLS_DC) { - zval *constant = new_zval(ce); + zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS); ZVAL_LONG(constant, value); return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); } int zend_declare_class_constant_bool(zend_class_entry *ce, char *name, size_t name_length, zend_bool value TSRMLS_DC) { - zval *constant = new_zval(ce); + zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS); ZVAL_BOOL(constant, value); return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); } int zend_declare_class_constant_double(zend_class_entry *ce, char *name, size_t name_length, double value TSRMLS_DC) { - zval *constant = new_zval(ce); + zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS); ZVAL_DOUBLE(constant, value); return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); } @@ -108,7 +108,7 @@ int zend_declare_class_constant_string(zend_class_entry *ce, char *name, size_t int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t name_length, char *value, size_t value_length TSRMLS_DC) { - zval *constant = new_zval(ce); + zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS); if (ce->type & ZEND_INTERNAL_CLASS) { ZVAL_STRINGL(constant, zend_strndup(value, value_length), value_length, 0); } else { @@ -117,7 +117,6 @@ int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC); } - int zend_update_static_property(zend_class_entry *scope, char *name, size_t name_len, zval *value TSRMLS_DC) { int retval; @@ -125,93 +124,13 @@ int zend_update_static_property(zend_class_entry *scope, char *name, size_t name zend_class_entry *old_scope = EG(scope); EG(scope) = scope; - if (!(property = zend_std_get_static_property(scope, name, name_len, 0 TSRMLS_CC))) { - EG(scope) = old_scope; - return FAILURE; - } - EG(scope) = old_scope; - if (*property == value) { - return SUCCESS; - } - if (scope->type & ZEND_INTERNAL_CLASS) { - int refcount; - zend_uchar is_ref; - - refcount = (*property)->refcount; - is_ref = (*property)->is_ref; - - /* clean */ - switch (Z_TYPE_PP(property)) - { - case IS_BOOL: case IS_LONG: case IS_NULL: - break; - - case IS_RESOURCE: - zend_list_delete(Z_LVAL_PP(property)); - break; - - case IS_STRING: case IS_CONSTANT: - free(Z_STRVAL_PP(property)); - break; - - case IS_OBJECT: - if (Z_OBJ_HT_PP(property)->del_ref) { - Z_OBJ_HT_PP(property)->del_ref(*property TSRMLS_CC); - } - break; - - case IS_ARRAY: case IS_CONSTANT_ARRAY: - if (Z_ARRVAL_PP(property) && Z_ARRVAL_PP(property) != &EG(symbol_table)) { - zend_hash_destroy(Z_ARRVAL_PP(property)); - free(Z_ARRVAL_PP(property)); - } - break; - } - - /* copy */ - **property = *value; - - /* ctor */ - switch (Z_TYPE_PP(property)) - { - case IS_BOOL: case IS_LONG: case IS_NULL: - break; - - case IS_RESOURCE: - zend_list_addref(Z_LVAL_PP(property)); - break; - - case IS_STRING: case IS_CONSTANT: - Z_STRVAL_PP(property) = (char *) zend_strndup(Z_STRVAL_PP(property), Z_STRLEN_PP(property)); - break; - - case IS_OBJECT: - if (Z_OBJ_HT_PP(property)->add_ref) { - Z_OBJ_HT_PP(property)->add_ref(*property TSRMLS_CC); - } - break; - - case IS_ARRAY: case IS_CONSTANT_ARRAY: - { - if (Z_ARRVAL_PP(property) != &EG(symbol_table)) { - zval *tmp; - HashTable *old = Z_ARRVAL_PP(property); - - Z_ARRVAL_PP(property) = (HashTable *) malloc(sizeof(HashTable)); - zend_hash_init(Z_ARRVAL_PP(property), 0, NULL, ZVAL_PTR_DTOR, 0); - zend_hash_copy(Z_ARRVAL_PP(property), old, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); - } - } - break; - } - - (*property)->refcount = refcount; - (*property)->is_ref = is_ref; - + if (!(property = zend_std_get_static_property(scope, name, name_len, 0 TSRMLS_CC))) { + retval = FAILURE; + } else if (*property == value) { retval = SUCCESS; - } else { + value->refcount++; if (PZVAL_IS_REF(*property)) { zval_dtor(*property); (*property)->type = value->type; @@ -220,22 +139,13 @@ int zend_update_static_property(zend_class_entry *scope, char *name, size_t name if (value->refcount) { zval_copy_ctor(*property); } - - retval = SUCCESS; } else { - value->refcount++; - if (PZVAL_IS_REF(value)) { - SEPARATE_ZVAL(&value); - } - - retval = zend_hash_update(scope->static_members, name, name_len+1, &value, sizeof(zval *), NULL); + REPLACE_ZVAL_VALUE(property, value, 1); } + retval = SUCCESS; } - - if (!value->refcount) { - zval_dtor(value); - FREE_ZVAL(value); - } + zval_ptr_dtor(&value); + EG(scope) = old_scope; return retval; } @@ -275,8 +185,24 @@ int zend_update_static_property_stringl(zend_class_entry *scope, char *name, siz return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC); } -#endif -#endif +void zend_fix_static_properties(zend_class_entry *ce, HashTable *static_members TSRMLS_DC) +{ + zend_hash_copy(static_members, ce->static_members, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + zend_hash_destroy(ce->static_members); + zend_hash_init_ex(ce->static_members, static_members->nNumOfElements, NULL, ZVAL_PTR_DTOR, 1, 0); +} + +void zend_init_static_properties(zend_class_entry *ce, HashTable *static_members TSRMLS_DC) +{ + zend_hash_copy(ce->static_members, static_members, (copy_ctor_func_t) dup_zval, NULL, sizeof(zval *)); +} + +void zend_clean_static_properties(zend_class_entry *ce TSRMLS_DC) +{ + zend_hash_clean(ce->static_members); +} + +#endif /* PHP_MAJOR_VERSION == 5 */ /* * Local variables: