com php-src: Partially enable leak reports for objects: Zend/zend.c Zend/zend_execute_API.c Zend/zend_objects_API.c
| From: | Nikita Popov | Date: | Sat, 18 Apr 2015 15:31:11 +0000 |
| Subject: | com php-src: Partially enable leak reports for objects: Zend/zend.c Zend/zend_execute_API.c Zend/zend_objects_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86371@lists.php.net to get a copy of this message | ||
Commit: aef96d5169111db7e17f06ff6b13d56cd980cb8c
Author: Nikita Popov <nikic@php.net> Fri, 17 Apr 2015 12:37:51 +0200
Parents: f616a6f1ebf7ec8ece54022791f078bea8a1e973
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aef96d5169111db7e17f06ff6b13d56cd980cb8c
Log:
Partially enable leak reports for objects
Cycle leaks are currently not reported, because this needs further
work.
The last GC run has been moved to run earlier (before the object
store free), so that array cycles that hold references to objects
don't show up as leaks. Fingers crossed that this doesn't adversely
affect anything else.
Changed paths:
M Zend/zend.c
M Zend/zend_execute_API.c
M Zend/zend_objects_API.c
Diff:
diff --git a/Zend/zend.c b/Zend/zend.c
index 03082de..cf87b26 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -967,12 +967,6 @@ ZEND_API void zend_deactivate(void) /* {{{ */
shutdown_compiler();
} zend_end_try();
-#if ZEND_DEBUG
- if (GC_G(gc_enabled) && !CG(unclean_shutdown)) {
- gc_collect_cycles();
- }
-#endif
-
zend_destroy_rsrc_list(&EG(regular_list));
#if GC_BENCH
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index ac9f4b1..37a2715 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -331,6 +331,12 @@ void shutdown_executor(void) /* {{{ */
zend_close_rsrc_list(&EG(regular_list));
} zend_end_try();
+#if ZEND_DEBUG
+ if (GC_G(gc_enabled) && !CG(unclean_shutdown)) {
+ gc_collect_cycles();
+ }
+#endif
+
zend_try {
zend_objects_store_free_object_storage(&EG(objects_store));
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index 92e36a5..4be4723 100644
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@ -78,7 +78,7 @@ ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects
{
uint32_t i;
- /* Free object properties but don't free object their selves */
+ /* Free object contents, but don't free objects themselves */
for (i = objects->top - 1; i > 0 ; i--) {
zend_object *obj = objects->object_buckets[i];
@@ -94,11 +94,13 @@ ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects
}
}
- /* Now free objects theirselves */
+ /* Free objects themselves if they now have a refcount of 0, which means that
+ * they were previously part of a cycle. Everything else will report as a leak.
+ * Cycles are allowed because not all internal objects currently support GC. */
for (i = 1; i < objects->top ; i++) {
zend_object *obj = objects->object_buckets[i];
- if (IS_OBJ_VALID(obj)) {
+ if (IS_OBJ_VALID(obj) && GC_REFCOUNT(obj) == 0) {
/* Not adding to free list as we are shutting down anyway */
void *ptr = ((char*)obj) - obj->handlers->offset;
GC_REMOVE_FROM_BUFFER(obj);