cvs: ZendEngine2 / zend_API.c zend_object_handlers.c zend_objects.c zend_objects.h

sebastian Wed Mar 26 01:32:53 2003 EDT Modified files: /ZendEngine2 zend_API.c zend_object_handlers.c zend_objects.c zend_objects.h Log: Eliminate TSRMLS_FETCH() calls in zend_objects_new() and zend_objects_get_address(). Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.159 ZendEngine2/zend_API.c:1.160 --- ZendEngine2/zend_API.c:1.159 Wed Mar 19 16:07:49 2003 +++ ZendEngine2/zend_API.c Wed Mar 26 01:32:53 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.c,v 1.159 2003/03/19 21:07:49 andrei Exp $ */ +/* $Id: zend_API.c,v 1.160 2003/03/26 06:32:53 sebastian Exp $ */ #include "zend.h" #include "zend_execute.h" @@ -661,7 +661,7 @@ arg->type = IS_OBJECT; if (class_type->create_object == NULL) { - arg->value.obj = zend_objects_new(&object, class_type); + arg->value.obj = zend_objects_new(&object, class_type TSRMLS_CC); if (properties) { object->properties = properties; } else { @@ -1432,7 +1432,7 @@ { zend_object_value retval; zend_object *intern; - retval = zend_objects_new(&intern, class_type); + retval = zend_objects_new(&intern, class_type TSRMLS_CC); ALLOC_HASHTABLE(intern->properties); zend_hash_init(intern->properties, 0, NULL, ZVAL_PTR_DTOR, 0); zend_error(E_WARNING, "%s() has been disabled for security reasons", class_type->name); Index: ZendEngine2/zend_object_handlers.c diff -u ZendEngine2/zend_object_handlers.c:1.44 ZendEngine2/zend_object_handlers.c:1.45 --- ZendEngine2/zend_object_handlers.c:1.44 Tue Mar 18 11:30:23 2003 +++ ZendEngine2/zend_object_handlers.c Wed Mar 26 01:32:53 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_object_handlers.c,v 1.44 2003/03/18 16:30:23 zeev Exp $ */ +/* $Id: zend_object_handlers.c,v 1.45 2003/03/26 06:32:53 sebastian Exp $ */ #include "zend.h" #include "zend_globals.h" @@ -29,7 +29,7 @@ #define DEBUG_OBJECT_HANDLERS 0 -#define Z_OBJ_P(zval_p) zend_objects_get_address(zval_p) +#define Z_OBJ_P(zval_p) zend_objects_get_address(zval_p TSRMLS_CC) /* __X accessors explanation: Index: ZendEngine2/zend_objects.c diff -u ZendEngine2/zend_objects.c:1.27 ZendEngine2/zend_objects.c:1.28 --- ZendEngine2/zend_objects.c:1.27 Fri Jan 31 20:49:14 2003 +++ ZendEngine2/zend_objects.c Wed Mar 26 01:32:53 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_objects.c,v 1.27 2003/02/01 01:49:14 sniper Exp $ */ +/* $Id: zend_objects.c,v 1.28 2003/03/26 06:32:53 sebastian Exp $ */ #include "zend.h" #include "zend_globals.h" @@ -68,12 +68,10 @@ efree(object); } -ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type) +ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type TSRMLS_DC) { zend_object_value retval; - TSRMLS_FETCH(); - *object = emalloc(sizeof(zend_object)); (*object)->ce = class_type; retval.handle = zend_objects_store_put(*object, (zend_objects_store_dtor_t) zend_objects_destroy_object, NULL TSRMLS_CC); @@ -83,9 +81,8 @@ return retval; } -ZEND_API zend_object *zend_objects_get_address(zval *zobject) +ZEND_API zend_object *zend_objects_get_address(zval *zobject TSRMLS_DC) { - TSRMLS_FETCH(); return (zend_object *)zend_object_store_get_object(zobject TSRMLS_CC); } @@ -96,8 +93,8 @@ zend_object *new_object; zend_object_handle handle = Z_OBJ_HANDLE_P(zobject); - old_object = zend_objects_get_address(zobject); - retval = zend_objects_new(&new_object, old_object->ce); + old_object = zend_objects_get_address(zobject TSRMLS_CC); + retval = zend_objects_new(&new_object, old_object->ce TSRMLS_CC); if (old_object->ce->clone) { zval *old_obj; Index: ZendEngine2/zend_objects.h diff -u ZendEngine2/zend_objects.h:1.16 ZendEngine2/zend_objects.h:1.17 --- ZendEngine2/zend_objects.h:1.16 Fri Jan 31 20:49:14 2003 +++ ZendEngine2/zend_objects.h Wed Mar 26 01:32:53 2003 @@ -17,16 +17,16 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_objects.h,v 1.16 2003/02/01 01:49:14 sniper Exp $ */ +/* $Id: zend_objects.h,v 1.17 2003/03/26 06:32:53 sebastian Exp $ */ #ifndef ZEND_OBJECTS_H #define ZEND_OBJECTS_H #include "zend.h" -ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type); +ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type TSRMLS_DC); ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handle handle TSRMLS_DC); -ZEND_API zend_object *zend_objects_get_address(zval *object); +ZEND_API zend_object *zend_objects_get_address(zval *object TSRMLS_DC); ZEND_API zend_object_value zend_objects_clone_obj(zval *object TSRMLS_DC); #endif /* ZEND_OBJECTS_H */