Fixed destruction of objects and iterators on unclean request shutdown and GC (few...

Now we destroy objects it two steps. At first - object properties of all objects and only then the objects their selves.

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 104c5b3ed47abbe5250805e6e540893656987d84..d9e926b6850d5f0f7bc1762b14cb08026d662dfd 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3158,7 +3158,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint
 
        if (object &&
            (!EG(objects_store).object_buckets ||
-            !IS_VALID(EG(objects_store).object_buckets[object->handle]))) {
+            !IS_OBJ_VALID(EG(objects_store).object_buckets[object->handle]))) {
                return 0;
        }
 
@@ -3246,7 +3246,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint
 
                                        } else if (Z_TYPE_P(obj) == IS_OBJECT) {
                                                if (!EG(objects_store).object_buckets ||
-                                                   !IS_VALID(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(obj)])) {
+                                                   !IS_OBJ_VALID(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(obj)])) {
                                                        return 0;
                                                }
 

diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index 0fa0a6aec332c1d3d0f7d182913ad616efe5bedf..238718b0ce126c8109698ed5921389cc462e4d76 100644 (file)
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -241,9 +241,6 @@ static void zend_closure_free_storage(zend_object *object TSRMLS_DC) /* {{{ */
        if (Z_TYPE(closure->this_ptr) != IS_UNDEF) {
                zval_ptr_dtor(&closure->this_ptr);
        }
-
-       GC_REMOVE_FROM_BUFFER(closure);
-       efree(closure);
 }
 /* }}} */
 

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 018e473995a734a0fe387119fdccde8671d8dec5..cf321398f8ec160ca677e74932c5df7e0f605940 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -843,7 +843,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
        EX(object) = fci->object = fci_cache->object;
        if (fci->object &&
            (!EG(objects_store).object_buckets ||
-            !IS_VALID(EG(objects_store).object_buckets[fci->object->handle]))) {
+            !IS_OBJ_VALID(EG(objects_store).object_buckets[fci->object->handle]))) {
                return FAILURE;
        }
 

diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
index 1b3e347ed0bfdf8e44a765d97e4328da074cd91d..ec72d1e5ce661f755bf7eeb84efda225bc16547e 100644 (file)
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@ -218,7 +218,7 @@ tail_call:
                zend_object_get_gc_t get_gc;
                zend_object *obj = (zend_object*)ref;
 
-               if (EXPECTED(IS_VALID(EG(objects_store).object_buckets[obj->handle]) &&
+               if (EXPECTED(IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle]) &&
                             (get_gc = obj->handlers->get_gc) != NULL)) {
                        int i, n;
                        zval *table;
@@ -302,7 +302,7 @@ tail_call:
                        zend_object_get_gc_t get_gc;
                        zend_object *obj = (zend_object*)ref;
 
-                       if (EXPECTED(IS_VALID(EG(objects_store).object_buckets[obj->handle]) &&
+                       if (EXPECTED(IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle]) &&
                             (get_gc = obj->handlers->get_gc) != NULL)) {
                                int i, n;
                                zval *table;
@@ -399,7 +399,7 @@ tail_call:
                                zend_object_get_gc_t get_gc;
                                zend_object *obj = (zend_object*)ref;
 
-                               if (EXPECTED(IS_VALID(EG(objects_store).object_buckets[obj->handle]) &&
+                               if (EXPECTED(IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle]) &&
                                             (get_gc = obj->handlers->get_gc) != NULL)) {
                                        int i, n;
                                        zval *table;
@@ -490,7 +490,7 @@ tail_call:
                        /* PURPLE instead of BLACK to prevent buffering in nested gc calls */
 //???                  GC_SET_PURPLE(GC_INFO(obj));
 
-                       if (EXPECTED(IS_VALID(EG(objects_store).object_buckets[obj->handle]) &&
+                       if (EXPECTED(IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle]) &&
                                     (get_gc = obj->handlers->get_gc) != NULL)) {
                                int i, n;
                                zval *table;
@@ -634,14 +634,15 @@ ZEND_API int gc_collect_cycles(TSRMLS_D)
                                zend_object *obj = (zend_object*)p;
 
                                if (EG(objects_store).object_buckets &&
-                                   obj->handlers->dtor_obj &&
-                                   IS_VALID(EG(objects_store).object_buckets[obj->handle]) &&
+                                   IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle]) &&
                                        !(GC_FLAGS(obj) & IS_OBJ_DESTRUCTOR_CALLED)) {
 
                                        GC_FLAGS(obj) |= IS_OBJ_DESTRUCTOR_CALLED;
-                                       GC_REFCOUNT(obj)++;
-                                       obj->handlers->dtor_obj(obj TSRMLS_CC);
-                                       GC_REFCOUNT(obj)--;
+                                       if (obj->handlers->dtor_obj) {
+                                               GC_REFCOUNT(obj)++;
+                                               obj->handlers->dtor_obj(obj TSRMLS_CC);
+                                               GC_REFCOUNT(obj)--;
+                                       }
                                }
                        }
                        current = GC_G(next_to_free);
@@ -656,17 +657,41 @@ ZEND_API int gc_collect_cycles(TSRMLS_D)
                                zend_object *obj = (zend_object*)p;
 
                                if (EG(objects_store).object_buckets &&
-                                       IS_VALID(EG(objects_store).object_buckets[obj->handle])) {
-                                       GC_TYPE(obj) = IS_NULL;
-                                       zend_objects_store_free(obj TSRMLS_CC);
+                                   IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle]) &&
+                                       !(GC_FLAGS(obj) & IS_OBJ_FREE_CALLED)) {
+
+                                       GC_FLAGS(obj) |= IS_OBJ_FREE_CALLED;
+                                       if (obj->handlers->free_obj) {
+                                               GC_REFCOUNT(obj)++;
+                                               obj->handlers->free_obj(obj TSRMLS_CC);
+                                               GC_REFCOUNT(obj)--;
+                                       }
                                }
                        } else if (GC_TYPE(p) == IS_ARRAY) {
                                zend_array *arr = (zend_array*)p;
 
                                GC_TYPE(arr) = IS_NULL;
                                zend_hash_destroy(&arr->ht);
-                               GC_REMOVE_FROM_BUFFER(arr);
-                               efree(arr);
+                       }
+                       current = GC_G(next_to_free);
+               }
+
+               /* Free objects */
+               current = GC_G(to_free).next;
+               while (current != &GC_G(to_free)) {
+                       p = current->ref;
+                       GC_G(next_to_free) = current->next;
+                       if (GC_TYPE(p) == IS_OBJECT) {
+                               zend_object *obj = (zend_object*)p;
+
+                               if (EG(objects_store).object_buckets &&
+                                   IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle])) {
+
+                                       zend_objects_store_free(obj TSRMLS_CC);
+                               }
+                       } else {
+                               GC_REMOVE_FROM_BUFFER(p);
+                               efree(p);
                        }
                        current = GC_G(next_to_free);
                }

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 13808a0eb40060bca0cca94b28ae422f37fa2e2b..559e9f2e202697cdda63176740e6ead512555556 100644 (file)
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -212,12 +212,9 @@ static void zend_generator_free_storage(zend_object *object TSRMLS_DC) /* {{{ */
 
        zend_object_std_dtor(&generator->std TSRMLS_CC);
 
-       if (generator->iterator.std.handle) {
-               zend_iterator_dtor(&generator->iterator TSRMLS_CC);
+       if (generator->iterator) {
+               zend_iterator_dtor(generator->iterator TSRMLS_CC);
        }
-
-       GC_REMOVE_FROM_BUFFER(generator);
-       efree(generator);
 }
 /* }}} */
 
@@ -599,7 +596,9 @@ ZEND_METHOD(Generator, __wakeup)
 
 static void zend_generator_iterator_dtor(zend_object_iterator *iterator TSRMLS_DC) /* {{{ */
 {
+       zend_generator *generator = (zend_generator*)Z_OBJ(iterator->data);
        zval_ptr_dtor(&iterator->data);
+       generator->iterator = NULL;
 }
 /* }}} */
 
@@ -679,7 +678,7 @@ zend_object_iterator *zend_generator_get_iterator(zend_class_entry *ce, zval *ob
                return NULL;
        }
 
-       iterator = &generator->iterator;
+       iterator = generator->iterator = emalloc(sizeof(zend_object_iterator));
        
        zend_iterator_init(iterator TSRMLS_CC);
 

diff --git a/Zend/zend_generators.h b/Zend/zend_generators.h
index 1209bc2d6254e4789f5f43bfed874940065a7675..999ead4b6eb87a81ed4dda1cd7361a9ed251a020 100644 (file)
--- a/Zend/zend_generators.h
+++ b/Zend/zend_generators.h
@@ -28,7 +28,7 @@ extern ZEND_API zend_class_entry *zend_ce_generator;
 typedef struct _zend_generator {
        zend_object std;
 
-       zend_object_iterator iterator;
+       zend_object_iterator *iterator;
 
        /* The suspended execution context. */
        zend_execute_data *execute_data;

diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index ce659ba32ae601eae36775f3b5daab9e5c96c0d7..3e9d9378b68ccd382cc48ba30110763ff638552d 100644 (file)
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -153,7 +153,6 @@ static void zend_user_it_dtor(zend_object_iterator *_iter TSRMLS_DC)
 
        zend_user_it_invalidate_current(_iter TSRMLS_CC);
        zval_ptr_dtor(object);
-       efree(iter);
 }
 /* }}} */
 

diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c
index 89e0d19c6633c7ce87d41fefd6f49fb3e497433c..9fa4084d635ac83ef820d2d8e068021c7db6d8f9 100644 (file)
--- a/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c
@@ -27,6 +27,7 @@ static zend_class_entry zend_iterator_class_entry;
 static void iter_wrapper_dtor(zend_object *object TSRMLS_DC);
 
 static zend_object_handlers iterator_object_handlers = {
+       0,
        iter_wrapper_dtor,
        NULL,
        NULL,

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 03fd7b76c222d42aea1a05743203b5835f61f20b..2150ad57731e2177a4fe7ae802a2d11ed6ea9db1 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1620,7 +1620,9 @@ int zend_std_get_closure(zval *obj, zend_class_entry **ce_ptr, zend_function **f
 /* }}} */
 
 ZEND_API zend_object_handlers std_object_handlers = {
-       zend_object_free,                                               /* free_obj */
+       0,                                                                              /* offset */
+
+       zend_object_std_dtor,                                   /* free_obj */
        zend_objects_destroy_object,                    /* dtor_obj */
        zend_objects_clone_obj,                                 /* clone_obj */
 

diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h
index be099aee812a1475acda8cbb29898bba34ba0912..249effa10ebb0a890fe55e6bb172c77e521ae8a1 100644 (file)
--- a/Zend/zend_object_handlers.h
+++ b/Zend/zend_object_handlers.h
@@ -116,6 +116,8 @@ typedef HashTable *(*zend_object_get_gc_t)(zval *object, zval **table, int *n TS
 typedef int (*zend_object_do_operation_t)(zend_uchar opcode, zval *result, zval *op1, zval *op2 TSRMLS_DC);
 
 struct _zend_object_handlers {
+       /* offset of real object header (usually zero) */
+       int                                                                             offset;
        /* general object functions */
        zend_object_free_obj_t                                  free_obj;
        zend_object_dtor_obj_t                                  dtor_obj;

diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
index 35b237e132405cf9e25b60efb243ffd340b2cea7..34a4ddf4a70245eba8e1058c79403ee59fccaa6d 100644 (file)
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@ -128,13 +128,6 @@ ZEND_API void zend_objects_destroy_object(zend_object *object TSRMLS_DC)
        }
 }
 
-ZEND_API void zend_object_free(zend_object *object TSRMLS_DC)
-{
-       zend_object_std_dtor(object TSRMLS_CC);
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(object);
-}
-
 ZEND_API zend_object *zend_objects_new(zend_class_entry *ce TSRMLS_DC)
 {
        zend_object *object = emalloc(sizeof(zend_object) + sizeof(zval) * (ce->default_properties_count - 1));

diff --git a/Zend/zend_objects.h b/Zend/zend_objects.h
index ac0adf8634a67b187c35e4fd9a744b2c11dbba81..1521d9756bd025c32d92acae3b79154cfa0647c1 100644 (file)
--- a/Zend/zend_objects.h
+++ b/Zend/zend_objects.h
@@ -31,7 +31,6 @@ ZEND_API zend_object *zend_objects_new(zend_class_entry *ce TSRMLS_DC);
 ZEND_API void zend_objects_destroy_object(zend_object *object TSRMLS_DC);
 ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object *old_object TSRMLS_DC);
 ZEND_API zend_object *zend_objects_clone_obj(zval *object TSRMLS_DC);
-ZEND_API void zend_object_free(zend_object *object TSRMLS_DC);
 END_EXTERN_C()
 
 #endif /* ZEND_OBJECTS_H */

diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index a65b4a993e7e52b7db63b2cda5e29cb4a73e6d11..541b2a465ff81b59b92313655decf77c11b684cc 100644 (file)
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@ -42,12 +42,12 @@ ZEND_API void zend_objects_store_destroy(zend_objects_store *objects)
 
 ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TSRMLS_DC)
 {
-       zend_uint i = 1;
+       zend_uint i;
 
        for (i = 1; i < objects->top ; i++) {
                zend_object *obj = objects->object_buckets[i];
 
-               if (IS_VALID(obj)) {
+               if (IS_OBJ_VALID(obj)) {
                        if (!(GC_FLAGS(obj) & IS_OBJ_DESTRUCTOR_CALLED)) {
                                GC_FLAGS(obj) |= IS_OBJ_DESTRUCTOR_CALLED;
                                GC_REFCOUNT(obj)++;
@@ -68,7 +68,7 @@ ZEND_API void zend_objects_store_mark_destructed(zend_objects_store *objects TSR
        for (i = 1; i < objects->top ; i++) {
                zend_object *obj = objects->object_buckets[i];
 
-               if (IS_VALID(obj)) {
+               if (IS_OBJ_VALID(obj)) {
                        GC_FLAGS(obj) |= IS_OBJ_DESTRUCTOR_CALLED;
                }
        }
@@ -76,17 +76,33 @@ ZEND_API void zend_objects_store_mark_destructed(zend_objects_store *objects TSR
 
 ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects TSRMLS_DC)
 {
-       zend_uint i = 1;
+       zend_uint i;
 
+       /* Free object properties but don't free object their selves */
        for (i = 1; i < objects->top ; i++) {
                zend_object *obj = objects->object_buckets[i];
 
-               if (IS_VALID(obj)) {
-                       objects->object_buckets[i] = SET_INVALID(obj);
-                       if (obj->handlers->free_obj) {
-                               obj->handlers->free_obj(obj TSRMLS_CC);
+               if (IS_OBJ_VALID(obj)) {
+                       if (!(GC_FLAGS(obj) & IS_OBJ_FREE_CALLED)) {
+                               GC_FLAGS(obj) |= IS_OBJ_FREE_CALLED;
+                               if (obj->handlers->free_obj) {
+                                       GC_REFCOUNT(obj)++;
+                                       obj->handlers->free_obj(obj TSRMLS_CC);
+                                       GC_REFCOUNT(obj)--;
+                               }
                        }
+               }
+       }
+
+       /* Now free objects theirselves */
+       for (i = 1; i < objects->top ; i++) {
+               zend_object *obj = objects->object_buckets[i];
+
+               if (IS_OBJ_VALID(obj)) {
                        /* Not adding to free list as we are shutting down anyway */
+                       void *ptr = ((char*)obj) - obj->handlers->offset;
+                       GC_REMOVE_FROM_BUFFER(obj);
+                       efree(ptr);
                }
        }
 }
@@ -100,7 +116,7 @@ ZEND_API void zend_objects_store_put(zend_object *object TSRMLS_DC)
 
        if (EG(objects_store).free_list_head != -1) {
                handle = EG(objects_store).free_list_head;
-               EG(objects_store).free_list_head = GET_BUCKET_NUMBER(EG(objects_store).object_buckets[handle]);
+               EG(objects_store).free_list_head = GET_OBJ_BUCKET_NUMBER(EG(objects_store).object_buckets[handle]);
        } else {
                if (EG(objects_store).top == EG(objects_store).size) {
                        EG(objects_store).size <<= 1;
@@ -113,17 +129,16 @@ ZEND_API void zend_objects_store_put(zend_object *object TSRMLS_DC)
 }
 
 #define ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST(handle)                                                                                                                    \
-            SET_BUCKET_NUMBER(EG(objects_store).object_buckets[handle], EG(objects_store).free_list_head);     \
+            SET_OBJ_BUCKET_NUMBER(EG(objects_store).object_buckets[handle], EG(objects_store).free_list_head); \
                        EG(objects_store).free_list_head = handle;
 
 ZEND_API void zend_objects_store_free(zend_object *object TSRMLS_DC) /* {{{ */
 {
-       int handle = object->handle;
+       zend_uint handle = object->handle;
+       void *ptr = ((char*)object) - object->handlers->offset;
 
-       EG(objects_store).object_buckets[handle] = SET_INVALID(object);
-       if (object->handlers->free_obj) {
-               object->handlers->free_obj(object TSRMLS_CC);
-       }
+       GC_REMOVE_FROM_BUFFER(object);
+       efree(ptr);
        ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST(handle);
 }
 /* }}} */
@@ -135,7 +150,7 @@ ZEND_API void zend_objects_store_del(zend_object *object TSRMLS_DC) /* {{{ */
                when the refcount reaches 0 a second time
         */
        if (EG(objects_store).object_buckets &&
-           IS_VALID(EG(objects_store).object_buckets[object->handle])) {
+           IS_OBJ_VALID(EG(objects_store).object_buckets[object->handle])) {
                if (GC_REFCOUNT(object) == 0) {
                        int failure = 0;
 
@@ -155,15 +170,24 @@ ZEND_API void zend_objects_store_del(zend_object *object TSRMLS_DC) /* {{{ */
                        
                        if (GC_REFCOUNT(object) == 0) {
                                zend_uint handle = object->handle;
-
-                               EG(objects_store).object_buckets[handle] = SET_INVALID(object);
-                               if (object->handlers->free_obj) {
-                                       zend_try {
-                                               object->handlers->free_obj(object TSRMLS_CC);
-                                       } zend_catch {
-                                               failure = 1;
-                                       } zend_end_try();
+                               void *ptr;
+
+                               EG(objects_store).object_buckets[handle] = SET_OBJ_INVALID(object);
+                               if (!(GC_FLAGS(object) & IS_OBJ_FREE_CALLED)) {
+                                       GC_FLAGS(object) |= IS_OBJ_FREE_CALLED;
+                                       if (object->handlers->free_obj) {
+                                               zend_try {
+                                                       GC_REFCOUNT(object)++;
+                                                       object->handlers->free_obj(object TSRMLS_CC);
+                                                       GC_REFCOUNT(object)++;
+                                               } zend_catch {
+                                                       failure = 1;
+                                               } zend_end_try();
+                                       }
                                }
+                               ptr = ((char*)object) - object->handlers->offset;
+                               GC_REMOVE_FROM_BUFFER(object);
+                               efree(ptr);
                                ZEND_OBJECTS_STORE_ADD_TO_FREE_LIST(handle);
                        }
                        

diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h
index f3800c855b8844c10680e920c17c9a018dd03c78..4d6afe6842ff7f616ac86c4b71de35a50b1641b9 100644 (file)
--- a/Zend/zend_objects_API.h
+++ b/Zend/zend_objects_API.h
@@ -24,43 +24,16 @@
 
 #include "zend.h"
 
-//???typedef void (*zend_objects_store_dtor_t)(zend_object *object TSRMLS_DC);
-//???typedef void (*zend_objects_free_object_storage_t)(void *object TSRMLS_DC);
-//???typedef void (*zend_objects_store_clone_t)(zend_object *object, zend_object **object_clone TSRMLS_DC);
-
-//???typedef union _zend_object_store_bucket {
-//???  zend_object *object;
-//???  int next_free;
-//???  zend_bool destructor_called;
-//???  zend_bool valid;
-//???  zend_uchar apply_count;
-//???  union _store_bucket {
-//???          struct _store_object {
-//???                  zend_object *object;
-//???                  zend_objects_store_dtor_t dtor;
-//???                  zend_objects_free_object_storage_t free_storage;
-//???                  zend_objects_store_clone_t clone;
-//???                  const zend_object_handlers *handlers;
-//???                  zend_uint refcount;
-//???                  gc_root_buffer *buffered;
-//???          } obj;
-//???          zend_object *obj;
-//???          struct {
-//???                  int next;
-//???          } free_list;
-//???  } bucket;
-//???} zend_object_store_bucket;
-
-#define FREE_BUCKET                            1
-
-#define IS_VALID(o)                            (!(((zend_uintptr_t)(o)) & FREE_BUCKET))
-
-#define SET_INVALID(o)                 ((zend_object*)((((zend_uintptr_t)(o)) | FREE_BUCKET)))
-
-#define GET_BUCKET_NUMBER(o)   (((zend_intptr_t)(o)) >> 1)
-
-#define SET_BUCKET_NUMBER(o, n)        do { \
-               (o) = (zend_object*)((((zend_uintptr_t)(n)) << 1) | FREE_BUCKET); \
+#define OBJ_BUCKET_INVALID                     (1<<0)
+
+#define IS_OBJ_VALID(o)                                (!(((zend_uintptr_t)(o)) & OBJ_BUCKET_INVALID))
+
+#define SET_OBJ_INVALID(o)                     ((zend_object*)((((zend_uintptr_t)(o)) | OBJ_BUCKET_INVALID)))
+
+#define GET_OBJ_BUCKET_NUMBER(o)       (((zend_intptr_t)(o)) >> 1)
+
+#define SET_OBJ_BUCKET_NUMBER(o, n)    do { \
+               (o) = (zend_object*)((((zend_uintptr_t)(n)) << 1) | OBJ_BUCKET_INVALID); \
        } while (0)
 
 
@@ -98,7 +71,7 @@ ZEND_API void zend_object_store_ctor_failed(zend_object *object TSRMLS_DC);
 
 ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects TSRMLS_DC);
 
-#define ZEND_OBJECTS_STORE_HANDLERS zend_object_free, zend_object_std_dtor, zend_objects_clone_obj
+#define ZEND_OBJECTS_STORE_HANDLERS 0, zend_object_std_dtor, zend_objects_destroy_object, zend_objects_clone_obj
 
 ZEND_API zend_object *zend_object_create_proxy(zval *object, zval *member TSRMLS_DC);
 

diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index 8ace69a7db656c41bc77d10fce469beb220bdbc1..8baf8643af984a5600c9b4d75c5482422b387f10 100644 (file)
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -305,6 +305,7 @@ static inline zend_uchar zval_get_type(const zval* pz) {
 /* object flags (zval.value->gc.u.flags) */
 #define IS_OBJ_APPLY_COUNT                     0x07
 #define IS_OBJ_DESTRUCTOR_CALLED       (1<<3)
+#define IS_OBJ_FREE_CALLED                     (1<<4)
 
 #define Z_OBJ_APPLY_COUNT(zval) \
        (Z_GC_FLAGS(zval) & IS_OBJ_APPLY_COUNT)

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 5809586a0d9d4d3a19f7a0063c254fc21b009648..fa92c3495cdc6442c9a4943185a70773c3aaffb5 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -1861,8 +1861,6 @@ static void date_period_it_dtor(zend_object_iterator *iter TSRMLS_DC)
        date_period_it_invalidate_current(iter TSRMLS_CC);
 
        zval_ptr_dtor(&iterator->intern.data);
-
-       efree(iterator);
 }
 /* }}} */
 
@@ -1999,6 +1997,7 @@ static void date_register_classes(TSRMLS_D) /* {{{ */
        ce_date.create_object = date_object_new_date;
        date_ce_date = zend_register_internal_class_ex(&ce_date, NULL TSRMLS_CC);
        memcpy(&date_object_handlers_date, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       date_object_handlers_date.offset = XtOffsetOf(php_date_obj, std);
        date_object_handlers_date.free_obj = date_object_free_storage_date;
        date_object_handlers_date.clone_obj = date_object_clone_date;
        date_object_handlers_date.compare_objects = date_object_compare_date;
@@ -2034,6 +2033,7 @@ static void date_register_classes(TSRMLS_D) /* {{{ */
        ce_timezone.create_object = date_object_new_timezone;
        date_ce_timezone = zend_register_internal_class_ex(&ce_timezone, NULL TSRMLS_CC);
        memcpy(&date_object_handlers_timezone, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       date_object_handlers_timezone.offset = XtOffsetOf(php_timezone_obj, std);
        date_object_handlers_timezone.free_obj = date_object_free_storage_timezone;
        date_object_handlers_timezone.clone_obj = date_object_clone_timezone;
        date_object_handlers_timezone.get_properties = date_object_get_properties_timezone;
@@ -2061,6 +2061,7 @@ static void date_register_classes(TSRMLS_D) /* {{{ */
        ce_interval.create_object = date_object_new_interval;
        date_ce_interval = zend_register_internal_class_ex(&ce_interval, NULL TSRMLS_CC);
        memcpy(&date_object_handlers_interval, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       date_object_handlers_interval.offset = XtOffsetOf(php_interval_obj, std);
        date_object_handlers_interval.free_obj = date_object_free_storage_interval;
        date_object_handlers_interval.clone_obj = date_object_clone_interval;
        date_object_handlers_interval.read_property = date_interval_read_property;
@@ -2076,6 +2077,7 @@ static void date_register_classes(TSRMLS_D) /* {{{ */
        date_ce_period->iterator_funcs.funcs = &date_period_it_funcs;
        zend_class_implements(date_ce_period TSRMLS_CC, 1, zend_ce_traversable);
        memcpy(&date_object_handlers_period, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       date_object_handlers_period.offset = XtOffsetOf(php_period_obj, std);
        date_object_handlers_period.free_obj = date_object_free_storage_period;
        date_object_handlers_period.clone_obj = date_object_clone_period;
        date_object_handlers_period.get_properties = date_object_get_properties_period;
@@ -2440,8 +2442,6 @@ static void date_object_free_storage_date(zend_object *object TSRMLS_DC) /* {{{
        }
 
        zend_object_std_dtor(&intern->std TSRMLS_CC);
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(intern);
 } /* }}} */
 
 static void date_object_free_storage_timezone(zend_object *object TSRMLS_DC) /* {{{ */
@@ -2452,8 +2452,6 @@ static void date_object_free_storage_timezone(zend_object *object TSRMLS_DC) /*
                free(intern->tzi.z.abbr);
        }
        zend_object_std_dtor(&intern->std TSRMLS_CC);
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(intern);
 } /* }}} */
 
 static void date_object_free_storage_interval(zend_object *object TSRMLS_DC) /* {{{ */
@@ -2462,8 +2460,6 @@ static void date_object_free_storage_interval(zend_object *object TSRMLS_DC) /*
 
        timelib_rel_time_dtor(intern->diff);
        zend_object_std_dtor(&intern->std TSRMLS_CC);
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(intern);
 } /* }}} */
 
 static void date_object_free_storage_period(zend_object *object TSRMLS_DC) /* {{{ */
@@ -2484,8 +2480,6 @@ static void date_object_free_storage_period(zend_object *object TSRMLS_DC) /* {{
 
        timelib_rel_time_dtor(intern->interval);
        zend_object_std_dtor(&intern->std TSRMLS_CC);
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(intern);
 } /* }}} */
 
 /* Advanced Interface */

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 78d9f9dfb80bc0c188f51090c98998d99b2c9585..cdf48f2bb216b57918a9f8e23f3e969ecf2ebc27 100644 (file)
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2232,9 +2232,9 @@ static void accel_fast_zval_dtor(zval *zvalue)
                                        TSRMLS_FETCH();
 
 #if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO
-                                       GC_REMOVE_FROM_BUFFER(Z_OBJ_P(zvalue));
+//???                                  GC_REMOVE_FROM_BUFFER(Z_OBJ_P(zvalue));
 #endif
-                                       zend_objects_store_del(Z_OBJ_P(zvalue) TSRMLS_CC);
+                                       OBJ_RELEASE(Z_OBJ_P(zvalue));
                                }
                                break;
                        case IS_RESOURCE:

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index ff5d8e2091f858598ed434f2edae30b8070deac3..447f17ecaed66db4fdd941e086677933c2a2bacf 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -328,8 +328,6 @@ static void reflection_free_objects_storage(zend_object *object TSRMLS_DC) /* {{
        intern->ptr = NULL;
        zval_ptr_dtor(&intern->obj);
        zend_object_std_dtor(object TSRMLS_CC);
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(intern);
 }
 /* }}} */
 
@@ -6085,6 +6083,7 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */
 
        zend_std_obj_handlers = zend_get_std_object_handlers();
        memcpy(&reflection_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       reflection_object_handlers.offset = XtOffsetOf(reflection_object, zo);
        reflection_object_handlers.free_obj = reflection_free_objects_storage;
        reflection_object_handlers.clone_obj = NULL;
        reflection_object_handlers.write_property = _reflection_write_property;

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 6d83e8a60eb65310d569905fb0c5c956367ee88f..cf12aa6a66c41ca66231285f6c6ebf8b9ee31e67 100644 (file)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -169,9 +169,6 @@ static void spl_array_object_free_storage(zend_object *object TSRMLS_DC)
                zend_hash_destroy(intern->debug_info);
                efree(intern->debug_info);
        }
-
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(intern);
 }
 /* }}} */
 
@@ -991,8 +988,6 @@ static void spl_array_it_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
 {
        zend_user_it_invalidate_current(iter TSRMLS_CC);
        zval_ptr_dtor(&iter->data);
-
-       efree(iter);
 }
 /* }}} */
 
@@ -1927,6 +1922,8 @@ PHP_MINIT_FUNCTION(spl_array)
        REGISTER_SPL_IMPLEMENTS(ArrayObject, Countable);
        memcpy(&spl_handler_ArrayObject, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
+       spl_handler_ArrayObject.offset = XtOffsetOf(spl_array_object, std);
+
        spl_handler_ArrayObject.clone_obj = spl_array_object_clone;
        spl_handler_ArrayObject.read_dimension = spl_array_read_dimension;
        spl_handler_ArrayObject.write_dimension = spl_array_write_dimension;

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index b00a8862bc069ad419fbad06942edb949ad6ba9e..1e122774c49fefe9e889441dd4af4ff95128bbc7 100644 (file)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -126,9 +126,6 @@ static void spl_filesystem_object_free_storage(zend_object *object TSRMLS_DC) /*
        if (intern->it) {
                //????zend_iterator_dtor(&intern->it->intern);
        }
-
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(intern);
 } /* }}} */
 
 /* {{{ spl_ce_dir_object_new */
@@ -1659,7 +1656,6 @@ static void spl_filesystem_dir_it_dtor(zend_object_iterator *iter TSRMLS_DC)
                zval *object = &iterator->intern.data;
                zval_ptr_dtor(object);
        }
-       efree(iterator);
        /* Otherwise we were called from the owning object free storage handler as
         * it sets
         * iterator->intern.data to NULL.
@@ -1736,7 +1732,6 @@ static void spl_filesystem_tree_it_dtor(zend_object_iterator *iter TSRMLS_DC)
                        ZVAL_UNDEF(&iterator->current);
                }
        }
-       efree(iter);
 }
 /* }}} */
 
@@ -2982,7 +2977,8 @@ PHP_MINIT_FUNCTION(spl_directory)
 {
        REGISTER_SPL_STD_CLASS_EX(SplFileInfo, spl_filesystem_object_new, spl_SplFileInfo_functions);
        memcpy(&spl_filesystem_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
-       spl_filesystem_object_handlers.clone_obj  = spl_filesystem_object_clone;
+       spl_filesystem_object_handlers.offset = XtOffsetOf(spl_filesystem_object, std);
+       spl_filesystem_object_handlers.clone_obj = spl_filesystem_object_clone;
        spl_filesystem_object_handlers.cast_object = spl_filesystem_object_cast;
        spl_filesystem_object_handlers.get_debug_info  = spl_filesystem_object_get_debug_info;
        spl_filesystem_object_handlers.dtor_obj = zend_objects_destroy_object;

diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index f453ba717555611ec6fe16624f19897fcba96ae1..d0623c3d8cfc72f6fd856ee181789d95ca76add0 100644 (file)
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -366,9 +366,6 @@ static void spl_dllist_object_free_storage(zend_object *object TSRMLS_DC) /* {{{
                zend_hash_destroy(intern->debug_info);
                efree(intern->debug_info);
        }
-
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(intern);
 }
 /* }}} */
 
@@ -923,8 +920,6 @@ static void spl_dllist_it_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
 
        zend_user_it_invalidate_current(iter TSRMLS_CC);
        zval_ptr_dtor(&iterator->intern.it.data);
-
-       efree(iterator);
 }
 /* }}} */
 
@@ -1387,6 +1382,7 @@ PHP_MINIT_FUNCTION(spl_dllist) /* {{{ */
        REGISTER_SPL_STD_CLASS_EX(SplDoublyLinkedList, spl_dllist_object_new, spl_funcs_SplDoublyLinkedList);
        memcpy(&spl_handler_SplDoublyLinkedList, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
+       spl_handler_SplDoublyLinkedList.offset = XtOffsetOf(spl_dllist_object, std);
        spl_handler_SplDoublyLinkedList.clone_obj = spl_dllist_object_clone;
        spl_handler_SplDoublyLinkedList.count_elements = spl_dllist_object_count_elements;
        spl_handler_SplDoublyLinkedList.get_debug_info = spl_dllist_object_get_debug_info;

diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
index d2339b3a8ddb2585737bc5630ccf5aae2f15a3f8..5f7452bed28da445841316f83472957d350f47e5 100644 (file)
--- a/ext/spl/spl_fixedarray.c
+++ b/ext/spl/spl_fixedarray.c
@@ -209,9 +209,6 @@ static void spl_fixedarray_object_free_storage(zend_object *object TSRMLS_DC) /*
 
        zend_object_std_dtor(&intern->std TSRMLS_CC);
        zval_ptr_dtor(&intern->retval);
-
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(intern);
 }
 /* }}} */
 
@@ -870,8 +867,6 @@ static void spl_fixedarray_it_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{
 
        zend_user_it_invalidate_current(iter TSRMLS_CC);
        zval_ptr_dtor(&iterator->intern.it.data);
-
-       efree(iterator);
 }
 /* }}} */
 
@@ -1115,6 +1110,7 @@ PHP_MINIT_FUNCTION(spl_fixedarray)
        REGISTER_SPL_STD_CLASS_EX(SplFixedArray, spl_fixedarray_new, spl_funcs_SplFixedArray);
        memcpy(&spl_handler_SplFixedArray, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
+       spl_handler_SplFixedArray.offset          = XtOffsetOf(spl_fixedarray_object, std);
        spl_handler_SplFixedArray.clone_obj       = spl_fixedarray_object_clone;
        spl_handler_SplFixedArray.read_dimension  = spl_fixedarray_object_read_dimension;
        spl_handler_SplFixedArray.write_dimension = spl_fixedarray_object_write_dimension;

diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c
index 5358e3da9d883731766845023ce6efd6dbdc6477..f627353dc28f0918bdb83f50b4a679c0683f027d 100644 (file)
--- a/ext/spl/spl_heap.c
+++ b/ext/spl/spl_heap.c
@@ -245,9 +245,9 @@ static void spl_ptr_heap_insert(spl_ptr_heap *heap, zval *elem, void *cmp_userda
 
        if (heap->count+1 > heap->max_size) {
                /* we need to allocate more memory */
+               heap->elements  = erealloc(heap->elements, heap->max_size * 2 * sizeof(zval));
+               memset(heap->elements + heap->max_size, 0, heap->max_size * sizeof(zval));
                heap->max_size *= 2;
-               heap->elements  = erealloc(heap->elements, heap->max_size * sizeof(zval));
-               memset(heap->elements + heap->max_size/2 * sizeof(zval), 0, heap->max_size/2 * sizeof(zval));
        }
 
        heap->ctor(elem TSRMLS_CC);
@@ -377,9 +377,6 @@ static void spl_heap_object_free_storage(zend_object *object TSRMLS_DC) /* {{{ *
                zend_hash_destroy(intern->debug_info);
                efree(intern->debug_info);
        }
-
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(intern);
 }
 /* }}} */
 
@@ -878,8 +875,6 @@ static void spl_heap_it_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
 
        zend_user_it_invalidate_current(iter TSRMLS_CC);
        zval_ptr_dtor(&iterator->intern.it.data);
-
-       efree(iterator);
 }
 /* }}} */
 
@@ -1198,6 +1193,7 @@ PHP_MINIT_FUNCTION(spl_heap) /* {{{ */
        REGISTER_SPL_STD_CLASS_EX(SplHeap, spl_heap_object_new, spl_funcs_SplHeap);
        memcpy(&spl_handler_SplHeap, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
+       spl_handler_SplHeap.offset         = XtOffsetOf(spl_heap_object, std);
        spl_handler_SplHeap.clone_obj      = spl_heap_object_clone;
        spl_handler_SplHeap.count_elements = spl_heap_object_count_elements;
        spl_handler_SplHeap.get_debug_info = spl_heap_object_get_debug_info;
@@ -1218,6 +1214,7 @@ PHP_MINIT_FUNCTION(spl_heap) /* {{{ */
        REGISTER_SPL_STD_CLASS_EX(SplPriorityQueue, spl_heap_object_new, spl_funcs_SplPriorityQueue);
        memcpy(&spl_handler_SplPriorityQueue, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
+       spl_handler_SplPriorityQueue.offset         = XtOffsetOf(spl_heap_object, std);
        spl_handler_SplPriorityQueue.clone_obj      = spl_heap_object_clone;
        spl_handler_SplPriorityQueue.count_elements = spl_heap_object_count_elements;
        spl_handler_SplPriorityQueue.get_debug_info = spl_pqueue_object_get_debug_info;

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 1aba634b28a906545f0afaf6e4f2e4ec9cfee7de..443fbbc003bec1f439aac598710e8d410225a624 100644 (file)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -160,7 +160,6 @@ static void spl_recursive_it_dtor(zend_object_iterator *_iter TSRMLS_DC)
        object->level = 0;
 
        zval_ptr_dtor(&iter->intern.data);
-       efree(iter);
 }
 
 static int spl_recursive_it_valid_ex(spl_recursive_it_object *object, zval *zthis TSRMLS_DC)
@@ -888,9 +887,6 @@ static void spl_RecursiveIteratorIterator_free_storage(zend_object *_object TSRM
        smart_str_free(&object->prefix[5]);
 
        smart_str_free(&object->postfix[0]);
-
-       GC_REMOVE_FROM_BUFFER(_object);
-       efree(object);
 }
 /* }}} */
 
@@ -2266,10 +2262,7 @@ static void spl_dual_it_free_storage(zend_object *_object TSRMLS_DC)
                }
        }
 
-       //zend_object_std_dtor(&object->std TSRMLS_CC);
-
-       GC_REMOVE_FROM_BUFFER(_object);
-       efree(object);
+       //???zend_object_std_dtor(&object->std TSRMLS_CC);
 }
 /* }}} */
 
@@ -3603,12 +3596,14 @@ PHP_MINIT_FUNCTION(spl_iterators)
        REGISTER_SPL_ITERATOR(RecursiveIteratorIterator);
 
        memcpy(&spl_handlers_rec_it_it, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       spl_handlers_rec_it_it.offset = XtOffsetOf(spl_recursive_it_object, std);
        spl_handlers_rec_it_it.get_method = spl_recursive_it_get_method;
        spl_handlers_rec_it_it.clone_obj = NULL;
        spl_handlers_rec_it_it.dtor_obj = spl_RecursiveIteratorIterator_dtor;
        spl_handlers_rec_it_it.free_obj = spl_RecursiveIteratorIterator_free_storage;
 
        memcpy(&spl_handlers_dual_it, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       spl_handlers_dual_it.offset = XtOffsetOf(spl_dual_it_object, std);
        spl_handlers_dual_it.get_method = spl_dual_it_get_method;
        /*spl_handlers_dual_it.call_method = spl_dual_it_call_method;*/
        spl_handlers_dual_it.clone_obj = NULL;

diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 089c324e462113d37c5b19e08ee92c1806c2f7af..e4e36760f267070a5299d33d45617cf587d10706 100644 (file)
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -113,9 +113,6 @@ void spl_SplObjectStorage_free_storage(zend_object *object TSRMLS_DC) /* {{{ */
                zend_hash_destroy(intern->debug_info);
                efree(intern->debug_info);
        }
-
-       GC_REMOVE_FROM_BUFFER(object);
-       efree(intern);
 } /* }}} */
 
 static zend_string *spl_object_storage_get_hash(spl_SplObjectStorage *intern, zval *this, zval *obj TSRMLS_DC) {
@@ -1291,6 +1288,7 @@ PHP_MINIT_FUNCTION(spl_observer)
        REGISTER_SPL_STD_CLASS_EX(SplObjectStorage, spl_SplObjectStorage_new, spl_funcs_SplObjectStorage);
        memcpy(&spl_handler_SplObjectStorage, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
+       spl_handler_SplObjectStorage.offset          = XtOffsetOf(spl_SplObjectStorage, std);
        spl_handler_SplObjectStorage.get_debug_info  = spl_object_storage_debug_info;
        spl_handler_SplObjectStorage.compare_objects = spl_object_storage_compare_objects;
        spl_handler_SplObjectStorage.clone_obj       = spl_object_storage_clone;