diff options
| author | Andi Gutmans <andi@php.net> | 1999-10-01 23:26:00 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-10-01 23:26:00 +0000 |
| commit | 4dd47ffbc1f263afca85cea8c68756d9c19783f1 (patch) | |
| tree | b59899e242d63433945ce91403e0c0e15bf94831 /Zend/zend_execute_API.c | |
| parent | f67a65543d15af3536eebd69021d0fd22b67506b (diff) | |
| download | php-git-4dd47ffbc1f263afca85cea8c68756d9c19783f1.tar.gz | |
- Remove locking support completely
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 9b6f1d04db..aee059c8fb 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -85,11 +85,9 @@ void init_executor(CLS_D ELS_DC) var_uninit(&EG(error_zval)); EG(uninitialized_zval).refcount = 1; EG(uninitialized_zval).EA.is_ref=0; - EG(uninitialized_zval).EA.locks = 0; EG(uninitialized_zval_ptr)=&EG(uninitialized_zval); EG(error_zval).refcount = 1; EG(error_zval).EA.is_ref=0; - EG(error_zval).EA.locks = 0; EG(error_zval_ptr)=&EG(error_zval); EG(destroying_function_symbol_table) = 0; zend_ptr_stack_init(&EG(arg_types_stack)); @@ -205,8 +203,6 @@ ZEND_API inline void safe_free_zval_ptr(zval *p) ZEND_API int _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC) { - int locked = (*zval_ptr)->EA.locks; - #if DEBUG_ZEND>=2 printf("Reducing refcount for %x (%x): %d->%d\n", *zval_ptr, zval_ptr, (*zval_ptr)->refcount, (*zval_ptr)->refcount-1); #endif @@ -215,17 +211,7 @@ ZEND_API int _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC) zval_dtor(*zval_ptr); safe_free_zval_ptr(*zval_ptr); } - if (locked) { - ELS_FETCH(); - - if (EG(destroying_function_symbol_table)) { - return 1; - } else { - return 0; /* don't kill the container bucket */ - } - } else { - return 1; - } + return 1; } @@ -347,7 +333,6 @@ int call_user_function_ex(HashTable *function_table, zval *object, zval *functio *new_zval = **params[i]; zval_copy_ctor(new_zval); new_zval->refcount = 1; - new_zval->EA.locks = 0; (*params[i])->refcount--; *params[i] = new_zval; } @@ -489,7 +474,6 @@ ZEND_API inline void zend_assign_to_variable_reference(znode *result, zval **var } value_ptr->refcount = 1; value_ptr->EA.is_ref = 1; - value_ptr->EA.locks = 0; } *variable_ptr_ptr = value_ptr; |