php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

- constructor_called is supposed to be destructor_called

Browse Source
This commit is contained in:
Andi Gutmans
2002-05-14 16:15:50 +00:00
parent b63236bd84
commit 1fe8df14c6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Zend/zend_objects.c
View File

@@ -69,7 +69,7 @@ void zend_objects_call_destructors(zend_objects *objects TSRMLS_DC)
for (i = 1; i < objects->top ; i++) {
if (EG(objects).object_buckets[i].valid) {
EG(objects).object_buckets[i].constructor_called = 1;
EG(objects).object_buckets[i].destructor_called = 1;
zend_objects_destroy_object(&EG(objects).object_buckets[i].bucket.obj.object, i TSRMLS_CC);
EG(objects).object_buckets[i].valid = 0;
}
@@ -95,7 +95,7 @@ zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class
handle = EG(objects).top++;
}
EG(objects).object_buckets[handle].valid = 1;
EG(objects).object_buckets[handle].constructor_called = 0;
EG(objects).object_buckets[handle].destructor_called = 0;
EG(objects).object_buckets[handle].bucket.obj.refcount = 1;
*object = &EG(objects).object_buckets[handle].bucket.obj.object;
@@ -146,8 +146,8 @@ void zend_objects_delete_obj(zval *zobject TSRMLS_DC)
object = &EG(objects).object_buckets[handle].bucket.obj.object;
if (!EG(objects).object_buckets[handle].constructor_called) {
EG(objects).object_buckets[handle].constructor_called = 1;
if (!EG(objects).object_buckets[handle].destructor_called) {
EG(objects).object_buckets[handle].destructor_called = 1;
zend_objects_destroy_object(object, handle TSRMLS_CC);
}
@@ -172,9 +172,9 @@ void zend_objects_del_ref(zval *zobject TSRMLS_DC)
zend_object *object;
do {
if (EG(objects).object_buckets[handle].valid) {
if (!EG(objects).object_buckets[handle].constructor_called) {
if (!EG(objects).object_buckets[handle].destructor_called) {
object = &EG(objects).object_buckets[handle].bucket.obj.object;
EG(objects).object_buckets[handle].constructor_called = 1;
EG(objects).object_buckets[handle].destructor_called = 1;
zend_objects_destroy_object(object, handle TSRMLS_CC);
if (EG(objects).object_buckets[handle].bucket.obj.refcount == 0) {
ZEND_OBJECTS_ADD_TO_FREE_LIST();

2
Zend/zend_objects.h
View File

@@ -5,7 +5,7 @@
typedef struct _zend_object_bucket {
zend_bool valid;
zend_bool constructor_called;
zend_bool destructor_called;
union _bucket {
struct {
zend_object object;