X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_pq_object.c;h=5b3f217a95f7e7bb4c9561a7d954a34359787089;hb=7074c710d3374eea1a81ed5ef5299f2d724c4497;hp=bfab4101402fb98bdd50bd7aadeb0804ddf94dea;hpb=6e28a8741be3fccdaca960e492c31bc26837a4ed;p=m6w6%2Fext-pq diff --git a/src/php_pq_object.c b/src/php_pq_object.c index bfab410..5b3f217 100644 --- a/src/php_pq_object.c +++ b/src/php_pq_object.c @@ -17,6 +17,30 @@ #include #include "php_pq_object.h" +#include "php_pq_misc.h" + +void *php_pq_object_create(zend_class_entry *ce, void *intern, size_t obj_size, zend_object_handlers *oh, HashTable *ph) +{ + php_pq_object_t *o = ecalloc(1, obj_size + zend_object_properties_size(ce)); + + zend_object_std_init(&o->zo, ce); + object_properties_init(&o->zo, ce); + o->zo.handlers = oh; + o->intern = intern; + o->prophandler = ph; + + zend_hash_init(&o->gc, 0, NULL, NULL, 0); + + return o; +} + +void php_pq_object_dtor(zend_object *o) +{ + php_pq_object_t *obj = PHP_PQ_OBJ(NULL, o); + + zend_hash_destroy(&obj->gc); + zend_object_std_dtor(o); +} void php_pq_object_to_zval(void *o, zval *zv) { @@ -36,37 +60,64 @@ void php_pq_object_to_zval_no_addref(void *o, zval *zv) void php_pq_object_addref(void *o) { php_pq_object_t *obj = o; +#ifdef GC_ADDREF + GC_ADDREF(&obj->zo); +#else ++GC_REFCOUNT(&obj->zo); +#endif } -void php_pq_object_delref(void *o TSRMLS_DC) +void php_pq_object_delref(void *o) { php_pq_object_t *obj = o; - zend_objects_store_del(&obj->zo); + zval tmp; + + /* this should gc immediately */ + ZVAL_OBJ(&tmp, &obj->zo); + zval_ptr_dtor(&tmp); } struct apply_pi_to_ht_arg { HashTable *ht; - zval *object; php_pq_object_t *pq_obj; - unsigned addref:1; + unsigned gc:1; }; static int apply_pi_to_ht(zval *p, void *a) { zend_property_info *pi = Z_PTR_P(p); struct apply_pi_to_ht_arg *arg = a; - zval tmp_prop, *property = zend_read_property(arg->pq_obj->zo.ce, arg->object, pi->name->val, pi->name->len, 0, &tmp_prop); - if (arg->addref) { - Z_TRY_ADDREF_P(property); + if (arg->gc) { + php_pq_object_prophandler_t *handler; + + if ((handler = zend_hash_find_ptr(arg->pq_obj->prophandler, pi->name)) && handler->gc) { + zval return_value; + + ZVAL_ARR(&return_value, arg->ht); + handler->gc(arg->pq_obj, &return_value); + } + } else { + zval tmp_prop, *property; +#if PHP_VERSION_ID < 80000 + zval zobj; + + ZVAL_OBJ(&zobj, &arg->pq_obj->zo); +# if PHP_VERSION_ID < 70100 + property = zend_read_property(arg->pq_obj->zo.ce, &zobj, pi->name->val, pi->name->len, 0, &tmp_prop); +# else + property = zend_read_property_ex(arg->pq_obj->zo.ce, &zobj, pi->name, 0, &tmp_prop); +# endif +#else + property = zend_read_property_ex(arg->pq_obj->zo.ce, &arg->pq_obj->zo, pi->name, 0, &tmp_prop); +#endif + zend_hash_update(arg->ht, pi->name, property); } - zend_hash_update(arg->ht, pi->name, property); return ZEND_HASH_APPLY_KEEP; } -HashTable *php_pq_object_debug_info(zval *object, int *temp) +static inline HashTable *php_pq_object_debug_info_ex(zend_object *object, int *temp) { struct apply_pi_to_ht_arg arg = {NULL}; @@ -74,28 +125,79 @@ HashTable *php_pq_object_debug_info(zval *object, int *temp) ALLOC_HASHTABLE(arg.ht); ZEND_INIT_SYMTABLE(arg.ht); - arg.object = object; - arg.pq_obj = PHP_PQ_OBJ(object, NULL); - arg.addref = 1; + arg.pq_obj = PHP_PQ_OBJ(NULL, object); + arg.gc = 0; zend_hash_apply_with_argument(&arg.pq_obj->zo.ce->properties_info, apply_pi_to_ht, &arg); return arg.ht; } +#if PHP_VERSION_ID >= 80000 +HashTable *php_pq_object_debug_info(zend_object *object, int *temp) +{ + return php_pq_object_debug_info_ex(object, temp); +} +#else +HashTable *php_pq_object_debug_info(zval *object, int *temp) +{ + return php_pq_object_debug_info_ex(Z_OBJ_P(object), temp); +} +#endif -HashTable *php_pq_object_properties(zval *object) +static inline HashTable *php_pq_object_properties_ex(zend_object *object, HashTable *props) { struct apply_pi_to_ht_arg arg = {NULL}; - arg.ht = zend_get_std_object_handlers()->get_properties(object); - arg.object = object; - arg.pq_obj = PHP_PQ_OBJ(object, NULL); - arg.addref = 1; + arg.ht = props; + arg.pq_obj = PHP_PQ_OBJ(NULL, object); + arg.gc = 0; zend_hash_apply_with_argument(&arg.pq_obj->zo.ce->properties_info, apply_pi_to_ht, &arg); return arg.ht; } +#if PHP_VERSION_ID >= 80000 +HashTable *php_pq_object_properties(zend_object *object) +{ + return php_pq_object_properties_ex(object, zend_std_get_properties(object)); +} +#else +HashTable *php_pq_object_properties(zval *object) +{ + return php_pq_object_properties_ex(Z_OBJ_P(object), zend_std_get_properties(object)); +} +#endif + +static inline HashTable *php_pq_object_get_gc_ex(zend_object *object, HashTable *props, zval **table, int *n) +{ + struct apply_pi_to_ht_arg arg = {NULL}; + + arg.pq_obj = PHP_PQ_OBJ(NULL, object); + arg.ht = &arg.pq_obj->gc; + arg.gc = 1; + + if (GC_REFCOUNT(arg.ht) == 1) { + zend_hash_clean(arg.ht); + zend_hash_copy(arg.ht, props, NULL); + zend_hash_apply_with_argument(&arg.pq_obj->zo.ce->properties_info, apply_pi_to_ht, &arg); + } + + *table = NULL; + *n = 0; + + return arg.ht; +} +#if PHP_VERSION_ID >= 80000 +HashTable *php_pq_object_get_gc(zend_object *object, zval **table, int *n) +{ + return php_pq_object_get_gc_ex(object, zend_std_get_properties(object), table, n); +} +#else +HashTable *php_pq_object_get_gc(zval *object, zval **table, int *n) +{ + return php_pq_object_get_gc_ex(Z_OBJ_P(object), zend_std_get_properties(object), table, n); +} +#endif zend_class_entry *ancestor(zend_class_entry *ce) { @@ -105,42 +207,117 @@ zend_class_entry *ancestor(zend_class_entry *ce) return ce; } -zval *php_pq_object_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *tmp) +static inline int php_pq_object_read_prop_ex(zend_object *object, zend_string *member, int type, zval *return_value) { - php_pq_object_t *obj = PHP_PQ_OBJ(object, NULL); + php_pq_object_t *obj = PHP_PQ_OBJ(NULL, object); php_pq_object_prophandler_t *handler; - zval *return_value = NULL; if (!obj->intern) { - php_error(E_RECOVERABLE_ERROR, "%s not initialized", ancestor(obj->zo.ce)->name); - return_value = zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, tmp); - } else if (!(handler= zend_hash_find_ptr(obj->prophandler, Z_STR_P(member))) || !handler->read) { - return_value = zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, tmp); + php_error(E_RECOVERABLE_ERROR, "%s not initialized", ancestor(obj->zo.ce)->name->val); + } else if (!(handler = zend_hash_find_ptr(obj->prophandler, member)) || !handler->read) { + /* default handler */ } else if (type != BP_VAR_R) { php_error(E_WARNING, "Cannot access %s properties by reference or array key/index", ancestor(obj->zo.ce)->name->val); - return_value = zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, tmp); } else { - return_value = tmp; - handler->read(object, obj, return_value); + handler->read(obj, return_value); + return SUCCESS; } - return return_value; + return FAILURE; } +#if PHP_VERSION_ID >= 80000 +zval *php_pq_object_read_prop(zend_object *object, zend_string *member, int type, void **cache_slot, zval *tmp) +{ + if (SUCCESS != php_pq_object_read_prop_ex(object, member, type, tmp)) { + return zend_std_read_property(object, member, type, cache_slot, tmp); + } -void php_pq_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot) + zend_std_write_property(object, member, tmp, cache_slot); + + if (cache_slot) { + *cache_slot = NULL; + } + return tmp; +} +#else +zval *php_pq_object_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *tmp) +{ + zend_string *member_str = zval_get_string(member); + + if (SUCCESS != php_pq_object_read_prop_ex(Z_OBJ_P(object), member_str, type, tmp)) { + zend_string_release(member_str); + return zend_get_std_object_handlers()->read_property(object, member, type, cache_slot, tmp); + } + zend_string_release(member_str); + + zend_std_write_property(object, member, tmp, cache_slot); + + if (cache_slot) { + *cache_slot = NULL; + } + return tmp; +} +#endif + +static inline int php_pq_object_write_prop_ex(zend_object *object, zend_string *member, zval *value) { - php_pq_object_t *obj = PHP_PQ_OBJ(object, NULL); + php_pq_object_t *obj = PHP_PQ_OBJ(NULL, object); php_pq_object_prophandler_t *handler; if (!obj->intern) { php_error(E_RECOVERABLE_ERROR, "%s not initialized", ancestor(obj->zo.ce)->name->val); - zend_get_std_object_handlers()->write_property(object, member, value, cache_slot); - } else if ((handler = zend_hash_find_ptr(obj->prophandler, Z_STR_P(member)))) { + } else if (!(handler = zend_hash_find_ptr(obj->prophandler, member))) { + /* default handler */ + } else { if (handler->write) { - handler->write(object, obj, value); + handler->write(obj, value); } - } else { - zend_get_std_object_handlers()->write_property(object, member, value, cache_slot); + return SUCCESS; + } + return FAILURE; +} +#if PHP_VERSION_ID >= 80000 +zval *php_pq_object_write_prop(zend_object *object, zend_string *member, zval *value, void **cache_slot) +{ + if (SUCCESS != php_pq_object_write_prop_ex(object, member, value)) { + return zend_std_write_property(object, member, value, cache_slot); } + return value; +} +#elif PHP_VERSION_ID >= 70400 +zval *php_pq_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot) +{ + zend_string *member_str = zval_get_string(member); + if (SUCCESS != php_pq_object_write_prop_ex(Z_OBJ_P(object), member_str, value)) { + value = zend_std_write_property(object, member, value, cache_slot); + } + zend_string_release(member_str); + return value; +} +#else +void php_pq_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot) +{ + zend_string *member_str = zval_get_string(member); + if (SUCCESS != php_pq_object_write_prop_ex(Z_OBJ_P(object), member_str, value)) { + zend_std_write_property(object, member, value, cache_slot); + } + zend_string_release(member_str); +} +#endif + +#if PHP_VERSION_ID >= 80000 +zval *php_pq_object_get_prop_ptr_null(zend_object *object, zend_string *member, int type, void **cache_slot) +{ + return NULL; +} +#else +zval *php_pq_object_get_prop_ptr_null(zval *object, zval *member, int type, void **cache_slot) +{ + return NULL; +} +#endif + +void php_pq_object_prophandler_dtor(zval *zv) { + pefree(Z_PTR_P(zv), 1); }