From 1b1399c95d1358b23f234c14e84dda9b5007904e Mon Sep 17 00:00:00 2001 From: Jim Zubov Date: Thu, 9 Feb 2017 12:40:33 -0500 Subject: Added EG(flags) - executor global flags EG_FLAGS_IN_SHUTDOWN - is set when PHP is in shutdown state --- Zend/zend_objects_API.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Zend/zend_objects_API.c') diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index b64d413fc2..3aedba1bda 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -26,15 +26,12 @@ #include "zend_API.h" #include "zend_objects_API.h" -ZEND_TLS zend_objects_store_no_reuse; /* Would make more sense to make it a member of zend_objects_store, defining as a global to not break alignments */ - ZEND_API void zend_objects_store_init(zend_objects_store *objects, uint32_t init_size) { objects->object_buckets = (zend_object **) emalloc(init_size * sizeof(zend_object*)); objects->top = 1; /* Skip 0 so that handles are true */ objects->size = init_size; objects->free_list_head = -1; - zend_objects_store_no_reuse = 0; memset(&objects->object_buckets[0], 0, sizeof(zend_object*)); } @@ -46,7 +43,6 @@ ZEND_API void zend_objects_store_destroy(zend_objects_store *objects) ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects) { - zend_objects_store_no_reuse = 1; /* new objects spawned by dtors will never reuse unused slots, so their own dtors will be called further down the loop */ if (objects->top > 1) { uint32_t i; for (i = 1; i < objects->top; i++) { @@ -115,7 +111,10 @@ ZEND_API void zend_objects_store_put(zend_object *object) { int handle; - if (!zend_objects_store_no_reuse && EG(objects_store).free_list_head != -1) { + /* When in shutdown sequesnce - do not reuse previously freed handles, to make sure + * the dtors for newly created objects are called in zend_objects_store_call_destructors() loop + */ + if (!(EG(flags) & EG_FLAGS_IN_SHUTDOWN) && EG(objects_store).free_list_head != -1) { handle = EG(objects_store).free_list_head; EG(objects_store).free_list_head = GET_OBJ_BUCKET_NUMBER(EG(objects_store).object_buckets[handle]); } else { -- cgit v1.2.1