cvs: ZendEngine2 / zend.c zend_execute_API.c zend_globals.h

andi Thu Aug 19 16:29:05 2004 EDT Modified files: /ZendEngine2 zend.c zend_execute_API.c zend_globals.h Log: - Second wave of garbage removal. http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.289&r2=1.290&ty=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.289 ZendEngine2/zend.c:1.290 --- ZendEngine2/zend.c:1.289 Sun Jul 25 03:14:24 2004 +++ ZendEngine2/zend.c Thu Aug 19 16:29:04 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.289 2004/07/25 07:14:24 helly Exp $ */ +/* $Id: zend.c,v 1.290 2004/08/19 20:29:04 andi Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -879,8 +879,6 @@ char *error_filename; uint error_lineno; zval *orig_user_error_handler; - zval *orig_garbage[2]; - int orig_garbage_ptr; TSRMLS_FETCH(); /* Obtain relevant filename and lineno */ @@ -973,12 +971,6 @@ orig_user_error_handler = EG(user_error_handler); EG(user_error_handler) = NULL; - orig_garbage_ptr = EG(garbage_ptr); - EG(garbage_ptr) = 0; - if (orig_garbage_ptr > 0) { - memcpy(&orig_garbage, &EG(garbage), sizeof(zval*)*orig_garbage_ptr); - } - if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL TSRMLS_CC)==SUCCESS) { if (retval) { if (Z_TYPE_P(retval) == IS_BOOL && Z_LVAL_P(retval) == 0) { @@ -989,14 +981,6 @@ } else { /* The user error handler failed, use built-in error handler */ zend_error_cb(type, error_filename, error_lineno, format, args); - } - - if (orig_garbage_ptr > 0) { - while (EG(garbage_ptr)) { - zval_ptr_dtor(&EG(garbage)[--EG(garbage_ptr)]); - } - EG(garbage_ptr) = orig_garbage_ptr; - memcpy(&EG(garbage), &orig_garbage, sizeof(zval*)*orig_garbage_ptr); } EG(user_error_handler) = orig_user_error_handler; http://cvs.php.net/diff.php/ZendEngine2/zend_execute_API.c?r1=1.291&r2=1.292&ty=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.291 ZendEngine2/zend_execute_API.c:1.292 --- ZendEngine2/zend_execute_API.c:1.291 Mon Aug 2 04:27:57 2004 +++ ZendEngine2/zend_execute_API.c Thu Aug 19 16:29:04 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.291 2004/08/02 08:27:57 helly Exp $ */ +/* $Id: zend_execute_API.c,v 1.292 2004/08/19 20:29:04 andi Exp $ */ #include <stdio.h> #include <signal.h> @@ -157,7 +157,6 @@ zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_activator TSRMLS_CC); EG(opline_ptr) = NULL; - EG(garbage_ptr) = 0; zend_hash_init(&EG(included_files), 5, NULL, NULL, 0); @@ -252,12 +251,6 @@ zend_hash_apply(EG(function_table), (apply_func_t) zend_cleanup_function_data TSRMLS_CC); zend_hash_apply(EG(class_table), (apply_func_t) zend_cleanup_class_data TSRMLS_CC); - while (EG(garbage_ptr)) { - if (EG(garbage)[--EG(garbage_ptr)]->refcount==1) { - zval_ptr_dtor(&EG(garbage)[EG(garbage_ptr)]); - } - } - zend_ptr_stack_destroy(&EG(argument_stack)); /* Destroy all op arrays */ @@ -571,9 +564,6 @@ zend_function_state *original_function_state_ptr; zend_op_array *original_op_array; zend_op **original_opline_ptr; - zval *orig_free_op1, *orig_free_op2; - int (*orig_unary_op)(zval *result, zval *op1); - int (*orig_binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC); zend_class_entry *current_scope; zend_class_entry *calling_scope = NULL; zval *current_this; @@ -840,10 +830,6 @@ EG(return_value_ptr_ptr) = fci->retval_ptr_ptr; EG(active_op_array) = (zend_op_array *) EX(function_state).function; original_opline_ptr = EG(opline_ptr); - orig_free_op1 = EG(free_op1); - orig_free_op2 = EG(free_op2); - orig_unary_op = EG(unary_op); - orig_binary_op = EG(binary_op); zend_execute(EG(active_op_array) TSRMLS_CC); if (!fci->symbol_table) { zend_hash_destroy(EG(active_symbol_table)); @@ -853,10 +839,6 @@ EG(active_op_array) = original_op_array; EG(return_value_ptr_ptr)=original_return_value; EG(opline_ptr) = original_opline_ptr; - EG(free_op1) = orig_free_op1; - EG(free_op2) = orig_free_op2; - EG(unary_op) = orig_unary_op; - EG(binary_op) = orig_binary_op; } else { ALLOC_INIT_ZVAL(*fci->retval_ptr_ptr); if (EX(function_state).function->common.scope) { http://cvs.php.net/diff.php/ZendEngine2/zend_globals.h?r1=1.135&r2=1.136&ty=u Index: ZendEngine2/zend_globals.h diff -u ZendEngine2/zend_globals.h:1.135 ZendEngine2/zend_globals.h:1.136 --- ZendEngine2/zend_globals.h:1.135 Tue Mar 30 13:36:53 2004 +++ ZendEngine2/zend_globals.h Thu Aug 19 16:29:04 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_globals.h,v 1.135 2004/03/30 18:36:53 helly Exp $ */ +/* $Id: zend_globals.h,v 1.136 2004/08/19 20:29:04 andi Exp $ */ #ifndef ZEND_GLOBALS_H #define ZEND_GLOBALS_H @@ -207,12 +207,6 @@ HashTable persistent_list; zend_ptr_stack argument_stack; - zval *free_op1, *free_op2; - int (*unary_op)(zval *result, zval *op1); - int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC); - - zval *garbage[2]; - int garbage_ptr; int user_error_handler_error_reporting; zval *user_error_handler;