Cleanup

Author: danog

Zend/zend_alloc.c

@@ -243,9 +243,6 @@ ZEND_API void zend_memory_reset_peak_usage(void);
 /* Heap functions */
 typedef struct _zend_mm_heap zend_mm_heap;
 
-ZEND_API void ZEND_FASTCALL _zend_mm_validate(zend_mm_heap *heap);
-ZEND_API void ZEND_FASTCALL zend_mm_validate_fast(zend_mm_heap *heap);
-
 ZEND_API zend_mm_heap *zend_mm_startup(void);
 ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, bool full_shutdown, bool silent);
 ZEND_API ZEND_ATTRIBUTE_MALLOC void*  ZEND_FASTCALL _zend_mm_alloc(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_ALLOC_SIZE(2);
@@ -254,8 +251,6 @@ ZEND_API void*  ZEND_FASTCALL _zend_mm_realloc(zend_mm_heap *heap, void *p, size
 ZEND_API void*  ZEND_FASTCALL _zend_mm_realloc2(zend_mm_heap *heap, void *p, size_t size, size_t copy_size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
 ZEND_API size_t ZEND_FASTCALL _zend_mm_block_size(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
 
-#define zend_mm_validate(heap)				_zend_mm_validate((heap))
-
 #define zend_mm_alloc(heap, size)			_zend_mm_alloc((heap), (size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
 #define zend_mm_free(heap, p)				_zend_mm_free((heap), (p) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
 #define zend_mm_realloc(heap, p, size)		_zend_mm_realloc((heap), (p), (size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)

Zend/zend_alloc.h

@@ -430,9 +430,9 @@ void shutdown_executor(void) /* {{{ */
 	zend_string *key;
 	zval *zv;
 #if ZEND_DEBUG
-	bool fast_shutdown = 1;
+	bool fast_shutdown = 0;
 #else
-	bool fast_shutdown = !EG(full_tables_cleanup);
+	bool fast_shutdown = is_zend_mm() && !EG(full_tables_cleanup);
 #endif
 
 	zend_try {

Zend/zend_execute_API.c

@@ -2045,7 +2045,6 @@ ZEND_API int zend_gc_collect_cycles(void)
 					/* Modify current before calling free_obj (bug #78811: free_obj() can cause the root buffer (with current) to be reallocated.) */
 					current->ref = GC_MAKE_GARBAGE(((char*)obj) - obj->handlers->offset);
 					if (!(OBJ_FLAGS(obj) & IS_OBJ_FREE_CALLED)) {
-						printf("Invoking free on %p inside GC\n", obj);
 						GC_ADD_FLAGS(obj, IS_OBJ_FREE_CALLED);
 						GC_ADDREF(obj);
 						obj->handlers->free_obj(obj);

Zend/zend_gc.c

@@ -82,7 +82,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_mark_destructed(zend_objects_stor
 
 ZEND_API void ZEND_FASTCALL zend_objects_store_free_object_storage(zend_objects_store *objects, bool fast_shutdown)
 {
-	zend_object **obj_ptr, **end, *obj, *obj_next;
+	zend_object **obj_ptr, **end, *obj;
 
 	if (objects->top <= 1) {
 		return;
@@ -94,41 +94,18 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_free_object_storage(zend_objects_
 	obj_ptr = objects->object_buckets + objects->top;
 
 	if (fast_shutdown) {
-		bool first = true;
-		ptrdiff_t cnt = 1;
-		ptrdiff_t total = obj_ptr-end;
 		do {
 			obj_ptr--;
 			obj = *obj_ptr;
 			if (IS_OBJ_VALID(obj)) {
 				if (!(OBJ_FLAGS(obj) & IS_OBJ_FREE_CALLED)) {
-					printf("Freeing object %td/%td: %s\n", cnt++, total, ZSTR_VAL(obj->ce->name));
-
-//zend_mm_validate(zend_mm_get_heap());
-//puts("Pre flags OK\n");
-					
-					printf("Invoking free on %p during free_object_storage\n", obj);
 					GC_ADD_FLAGS(obj, IS_OBJ_FREE_CALLED);
-
-//zend_mm_validate(zend_mm_get_heap());
-//puts("Post flags OK\n");
-
 					if (obj->handlers->free_obj != zend_object_std_dtor) {
 						GC_ADDREF(obj);
-
-//zend_mm_validate(zend_mm_get_heap());
-//puts("Pre validation OK\n");
-
 						obj->handlers->free_obj(obj);
-					} else {
-						printf("Skipping free on %p during free_object_storage\n", obj);
 					}
-
-//zend_mm_validate(zend_mm_get_heap());
-//puts("Post validation OK\n");
 				}
 			}
-			first = false;
 		} while (obj_ptr != end);
 	} else {
 		do {
@@ -139,7 +116,6 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_free_object_storage(zend_objects_
 					GC_ADD_FLAGS(obj, IS_OBJ_FREE_CALLED);
 					GC_ADDREF(obj);
 					obj->handlers->free_obj(obj);
-					printf("Invoking free on %p\n", obj);
 				}
 			}
 		} while (obj_ptr != end);
@@ -216,9 +192,6 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_del(zend_object *object) /* {{{ *
 			GC_ADD_FLAGS(object, IS_OBJ_FREE_CALLED);
 			GC_SET_REFCOUNT(object, 1);
 			object->handlers->free_obj(object);
-			printf("Freeing %p and invoking free\n", object);
-		} else {
-			printf("Freeing %p without invoking free (%d)\n", object, OBJ_FLAGS(object));
 		}
 		ptr = ((char*)object) - object->handlers->offset;
 		GC_REMOVE_FROM_BUFFER(object);

Zend/zend_objects_API.c

@@ -42,8 +42,6 @@ static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr)
 	if (Z_REFCOUNTED_P(zval_ptr)) {
 		zend_refcounted *ref = Z_COUNTED_P(zval_ptr);
 		if (!GC_DELREF(ref)) {
-			//printf("Freeing %p\n", zval_ptr);
-			//fflush(stdout);
 			rc_dtor_func(ref);
 		} else {
 			gc_check_possible_root(ref);

Zend/zend_variables.h

@@ -13,9 +13,6 @@ ZEND_API void {%EXECUTOR_NAME%}_ex(zend_execute_data *ex)
 #endif
 {
 	DCL_OPLINE
-	if (ex != NULL) {
-		//zend_mm_validate(zend_mm_get_heap());
-	}
 
 #if defined(__GNUC__) && defined(__aarch64__)
 	__asm__ __volatile__ (""::: "v8","v9","v10","v11","v12","v13","v14","v15");

Zend/zend_vm_execute.h

@@ -124,7 +124,6 @@ static void zend_weakref_unregister(zend_object *object, void *payload, bool wea
 	zend_ulong obj_key = zend_object_to_weakref_key(object);
 	void *tagged_ptr = zend_hash_index_find_ptr(&EG(weakrefs), obj_key);
 	ZEND_ASSERT(tagged_ptr && "Weakref not registered?");
-zend_mm_validate(zend_mm_get_heap());
 
 	void *ptr = ZEND_WEAKREF_GET_PTR(tagged_ptr);
 	uintptr_t tag = ZEND_WEAKREF_GET_TAG(tagged_ptr);
@@ -142,27 +141,20 @@ zend_mm_validate(zend_mm_get_heap());
 		}
 		return;
 	}
-zend_mm_validate(zend_mm_get_heap());
 
 	HashTable *ht = ptr;
-
+#if ZEND_DEBUG
 	void *old_payload = zend_hash_index_find_ptr(ht, (zend_ulong) payload);
-	if (!(old_payload && "Weakref not registered?")) {
-abort();
-}
-	if (!(old_payload == payload)) {
-abort();
-}
-zend_mm_validate(zend_mm_get_heap());
+	ZEND_ASSERT(old_payload && "Weakref not registered?");
+	ZEND_ASSERT(old_payload == payload);
+#endif
 	zend_hash_index_del(ht, (zend_ulong) payload);
-zend_mm_validate(zend_mm_get_heap());
 	if (zend_hash_num_elements(ht) == 0) {
 		GC_DEL_FLAGS(object, IS_OBJ_WEAKLY_REFERENCED);
 		zend_hash_destroy(ht);
 		FREE_HASHTABLE(ht);
 		zend_hash_index_del(&EG(weakrefs), obj_key);
 	}
-zend_mm_validate(zend_mm_get_heap());
 
 	/* Do this last, as it may destroy the object. */
 	if (weakref_free)  {
@@ -172,7 +164,6 @@ zend_mm_validate(zend_mm_get_heap());
 		/* The optimization of skipping unref is only used in the destructor of WeakMap */
 		ZEND_ASSERT(ZEND_WEAKREF_GET_TAG(payload) == ZEND_WEAKREF_TAG_MAP);
 	}
-zend_mm_validate(zend_mm_get_heap());
 }
 
 ZEND_API zval *zend_weakrefs_hash_add(HashTable *ht, zend_object *key, zval *pData) {
@@ -199,8 +190,6 @@ void zend_weakrefs_init(void) {
 /* This is called when the object is garbage collected
  * to remove all WeakReference and WeakMap entries weakly referencing that object. */
 void zend_weakrefs_notify(zend_object *object) {
-	printf("Notify from %p\n", object);
-
 	/* Annoyingly we can't use the HT destructor here, because we need access to the key (which
 	 * is the object address), which is not provided to the dtor. */
 	const zend_ulong obj_key = zend_object_to_weakref_key(object);
@@ -339,28 +328,17 @@ static zend_object *zend_weakmap_create_object(zend_class_entry *ce)
 
 static void zend_weakmap_free_obj(zend_object *object)
 {
-zend_mm_validate(zend_mm_get_heap());
 	zend_weakmap *wm = zend_weakmap_from(object);
-zend_mm_validate(zend_mm_get_heap());
 	zend_ulong obj_key;
 	ZEND_HASH_MAP_FOREACH_NUM_KEY(&wm->ht, obj_key) {
 		/* Optimization: Don't call zend_weakref_unref_single to free individual entries from wm->ht when unregistering (which would do a hash table lookup, call zend_hash_index_del, and skip over any bucket collisions).
 		 * Let freeing the corresponding values for WeakMap entries be done in zend_hash_destroy, freeing objects sequentially.
 		 * The performance difference is notable for larger WeakMaps with worse cache locality. */
-zend_mm_validate(zend_mm_get_heap());
-zend_object *a = zend_weakref_key_to_object(obj_key);
-zend_mm_validate(zend_mm_get_heap());
-void *p = ZEND_WEAKREF_ENCODE(&wm->ht, ZEND_WEAKREF_TAG_MAP);
-zend_mm_validate(zend_mm_get_heap());
-		zend_weakref_unregister(a, p, 0);
-//zend_mm_validate(zend_mm_get_heap());
+		zend_weakref_unregister(
+			zend_weakref_key_to_object(obj_key), ZEND_WEAKREF_ENCODE(&wm->ht, ZEND_WEAKREF_TAG_MAP), 0);
 	} ZEND_HASH_FOREACH_END();
-//zend_mm_validate(zend_mm_get_heap());
 	zend_hash_destroy(&wm->ht);
-//zend_mm_validate_fast(zend_mm_get_heap());
-//zend_mm_validate(zend_mm_get_heap());
 	zend_object_std_dtor(&wm->std);
-//zend_mm_validate(zend_mm_get_heap());
 }
 
 static zval *zend_weakmap_read_dimension(zend_object *object, zval *offset, int type, zval *rv)