% prepare code for zend_call_destructors

Author: EdmondDantes

async.c

@@ -945,26 +945,14 @@ PHP_RINIT_FUNCTION(async) /* {{{ */
 	return SUCCESS;
 } /* }}} */
 
-PHP_RSHUTDOWN_FUNCTION(async) /* {{{ */
-{
-	ZEND_ASYNC_REACTOR_SHUTDOWN();
-
-	circular_buffer_dtor(&ASYNC_G(microtasks));
-	circular_buffer_dtor(&ASYNC_G(coroutine_queue));
-	zend_hash_destroy(&ASYNC_G(coroutines));
-
-	//async_host_name_list_dtor();
-	return SUCCESS;
-} /* }}} */
-
 zend_module_entry async_module_entry = {
 	STANDARD_MODULE_HEADER,
 	PHP_ASYNC_NAME,
 	ext_functions,
 	PHP_MINIT(async),
 	PHP_MSHUTDOWN(async),
 	PHP_RINIT(async),
-	PHP_RSHUTDOWN(async),
+	NULL,
 	PHP_MINFO(async),
 	PHP_ASYNC_VERSION,
 	PHP_MODULE_GLOBALS(async),

async_API.c

@@ -201,6 +201,17 @@ static void graceful_shutdown(void)
 	start_graceful_shutdown();
 }
 
+static void engine_shutdown(void)
+{
+	ZEND_ASYNC_REACTOR_SHUTDOWN();
+
+	circular_buffer_dtor(&ASYNC_G(microtasks));
+	circular_buffer_dtor(&ASYNC_G(coroutine_queue));
+	zend_hash_destroy(&ASYNC_G(coroutines));
+
+	//async_host_name_list_dtor();
+}
+
 zend_array * get_coroutines(void)
 {
 	return &ASYNC_G(coroutines);
@@ -891,6 +902,7 @@ void async_api_register(void)
 		add_microtask,
 		get_awaiting_info,
 		async_get_class_ce,
-		(zend_async_new_iterator_t)async_iterator_new
+		(zend_async_new_iterator_t)async_iterator_new,
+		engine_shutdown
 	);
 }

exceptions.c

@@ -193,15 +193,8 @@ ZEND_API ZEND_COLD void async_composite_exception_add_exception(zend_object *com
 	}
 }
 
-static void exception_coroutine_finally_callback(
-	zend_async_event_t *event,
-	zend_async_event_callback_t *callback,
-	void * result,
-	zend_object *exception
-)
+static void exception_coroutine_dispose(zend_coroutine_t *coroutine)
 {
-	zend_coroutine_t *coroutine = (zend_coroutine_t *) event;
-
 	if (coroutine->extended_data != NULL) {
 		zend_object *exception_obj = coroutine->extended_data;
 		coroutine->extended_data = NULL;
@@ -245,14 +238,9 @@ bool async_spawn_and_throw(zend_object *exception, zend_async_scope_t *scope, in
 		return false;
 	}
 
-	coroutine->event.add_callback(&coroutine->event, ZEND_ASYNC_EVENT_CALLBACK(exception_coroutine_finally_callback));
-	if (UNEXPECTED(EG(exception))) {
-		coroutine->event.dispose(&coroutine->event);
-		return false;
-	}
-
 	coroutine->internal_entry = exception_coroutine_entry;
 	coroutine->extended_data = exception;
+	coroutine->extended_dispose = exception_coroutine_dispose;
 	GC_ADDREF(exception);
 
 	return true;