Merge branch 'true-async-api' into true-async-api-stable

Author: EdmondDantes

Zend/zend_fibers.c

@@ -32,6 +32,8 @@
 #include "zend_generators.h"
 
 #include "zend_fibers.h"
+
+#include "zend_async_API.h"
 #include "zend_fibers_arginfo.h"
 
 #ifdef HAVE_VALGRIND
@@ -562,6 +564,19 @@ static void zend_fiber_cleanup(zend_fiber_context *context)
 	fiber->caller = NULL;
 }
 
+#ifdef PHP_ASYNC_API
+static zend_always_inline bool can_use_fiber(void)
+{
+	if (UNEXPECTED(ZEND_ASYNC_IS_ACTIVE)) {
+		zend_throw_error(zend_ce_fiber_error, "Cannot create a fiber while an True Async is active");
+		return false;
+	}
+
+	ZEND_ASYNC_DEACTIVATE;
+	return true;
+}
+#endif
+
 static ZEND_STACK_ALIGNED void zend_fiber_execute(zend_fiber_transfer *transfer)
 {
 	ZEND_ASSERT(Z_TYPE(transfer->value) == IS_NULL && "Initial transfer value to fiber context must be NULL");
@@ -711,6 +726,12 @@ ZEND_API zend_result zend_fiber_start(zend_fiber *fiber, zval *return_value)
 {
 	ZEND_ASSERT(fiber->context.status == ZEND_FIBER_STATUS_INIT);
 
+#ifdef PHP_ASYNC_API
+	if (UNEXPECTED(false == can_use_fiber())) {
+		return FAILURE;
+	}
+#endif
+
 	if (zend_fiber_init_context(&fiber->context, zend_ce_fiber, zend_fiber_execute, EG(fiber_stack_size)) == FAILURE) {
 		return FAILURE;
 	}
@@ -726,6 +747,12 @@ ZEND_API zend_result zend_fiber_start(zend_fiber *fiber, zval *return_value)
 
 ZEND_API void zend_fiber_resume(zend_fiber *fiber, zval *value, zval *return_value)
 {
+#ifdef PHP_ASYNC_API
+	if (UNEXPECTED(false == can_use_fiber())) {
+		return;
+	}
+#endif
+
 	ZEND_ASSERT(fiber->context.status == ZEND_FIBER_STATUS_SUSPENDED && fiber->caller == NULL);
 
 	fiber->stack_bottom->prev_execute_data = EG(current_execute_data);
@@ -737,6 +764,12 @@ ZEND_API void zend_fiber_resume(zend_fiber *fiber, zval *value, zval *return_val
 
 ZEND_API void zend_fiber_resume_exception(zend_fiber *fiber, zval *exception, zval *return_value)
 {
+#ifdef PHP_ASYNC_API
+	if (UNEXPECTED(false == can_use_fiber())) {
+		return;
+	}
+#endif
+
 	ZEND_ASSERT(fiber->context.status == ZEND_FIBER_STATUS_SUSPENDED && fiber->caller == NULL);
 
 	fiber->stack_bottom->prev_execute_data = EG(current_execute_data);
@@ -748,6 +781,12 @@ ZEND_API void zend_fiber_resume_exception(zend_fiber *fiber, zval *exception, zv
 
 ZEND_API void zend_fiber_suspend(zend_fiber *fiber, zval *value, zval *return_value)
 {
+#ifdef PHP_ASYNC_API
+	if (UNEXPECTED(false == can_use_fiber())) {
+		return;
+	}
+#endif
+
 	fiber->stack_bottom->prev_execute_data = NULL;
 
 	zend_fiber_transfer transfer = zend_fiber_suspend_internal(fiber, value);
@@ -876,6 +915,12 @@ ZEND_METHOD(Fiber, __construct)
 		Z_PARAM_FUNC(fci, fcc)
 	ZEND_PARSE_PARAMETERS_END();
 
+#ifdef PHP_ASYNC_API
+	if (UNEXPECTED(false == can_use_fiber())) {
+		RETURN_THROWS();
+	}
+#endif
+
 	zend_fiber *fiber = (zend_fiber *) Z_OBJ_P(ZEND_THIS);
 
 	if (UNEXPECTED(fiber->context.status != ZEND_FIBER_STATUS_INIT || Z_TYPE(fiber->fci.function_name) != IS_UNDEF)) {
@@ -898,6 +943,12 @@ ZEND_METHOD(Fiber, start)
 		Z_PARAM_VARIADIC_WITH_NAMED(fiber->fci.params, fiber->fci.param_count, fiber->fci.named_params);
 	ZEND_PARSE_PARAMETERS_END();
 
+#ifdef PHP_ASYNC_API
+	if (UNEXPECTED(false == can_use_fiber())) {
+		RETURN_THROWS();
+	}
+#endif
+
 	if (UNEXPECTED(zend_fiber_switch_blocked())) {
 		zend_throw_error(zend_ce_fiber_error, "Cannot switch fibers in current execution context");
 		RETURN_THROWS();

Zend/zend_gc.c

@@ -2176,11 +2176,21 @@ ZEND_API int zend_gc_collect_cycles(void)
 		return 0;
 	}
 
+	const bool in_fiber = EG(active_fiber) != NULL;
+
 	//
 	// We might enter this context from different coroutines, so we don’t initialize anything here.
 	//
-	gc_async_context_t *context = &GC_G(async_context);
-	gc_stack *stack = GC_G(gc_stack);
+	gc_async_context_t *context = NULL;
+	gc_stack *stack = NULL;
+
+	if (in_fiber) {
+		context = ecalloc(1, sizeof(gc_async_context_t));
+		stack = emalloc(sizeof(gc_stack));
+	} else {
+		context = &GC_G(async_context);
+		stack = GC_G(gc_stack);
+	}
 
 	if (UNEXPECTED(context->state == GC_ASYNC_STATE_CONTINUE)) {
 		// If we reach this point, it means the destructor call was interrupted by a suspend() operation,
@@ -2197,14 +2207,21 @@ ZEND_API int zend_gc_collect_cycles(void)
 		context->should_rerun_gc = 0;
 		context->did_rerun_gc = 0;
 		context->gc_flags = 0;
+		// reset the destructor index
+		GC_G(dtor_idx) = GC_FIRST_ROOT;
 
-		if (GC_G(gc_stack) == NULL) {
-			stack = ecalloc(1, sizeof(gc_stack));
+		if (false == in_fiber) {
+			if (GC_G(gc_stack) == NULL) {
+				stack = emalloc(sizeof(gc_stack));
+				stack->prev = NULL;
+				stack->next = NULL;
+				GC_G(gc_stack) = stack;
+			} else {
+				stack = GC_G(gc_stack);
+			}
+		} else {
 			stack->prev = NULL;
 			stack->next = NULL;
-			GC_G(gc_stack) = stack;
-		} else {
-			stack = GC_G(gc_stack);
 		}
 	}
 
@@ -2248,6 +2265,8 @@ ZEND_API int zend_gc_collect_cycles(void)
 		stack.next = NULL;
 #endif
 
+		end = 0;
+
 		if (GC_G(gc_active)) {
 			GC_G(collector_time) += zend_hrtime() - GC_COLLECT_START_TIME;
 			GC_COLLECT_FINISH_0;
@@ -2357,7 +2376,9 @@ ZEND_API int zend_gc_collect_cycles(void)
 		gc_stack_free(GC_COLLECT_STACK);
 
 #ifdef PHP_ASYNC_API
-		end = GC_G(first_unused);
+		if (false == in_fiber) {
+			end = GC_G(first_unused);
+		}
 #endif
 
 		/* Destroy zvals. The root buffer may be reallocated. */
@@ -2442,9 +2463,17 @@ ZEND_API int zend_gc_collect_cycles(void)
 
 	GC_G(collector_time) += zend_hrtime() - GC_COLLECT_START_TIME;
 #ifdef PHP_ASYNC_API
-	GC_G(async_context).state = GC_ASYNC_STATE_NONE;
-	if (GC_G(gc_stack) != NULL) {
-		GC_COLLECT_FREE_STACK;
+	if (in_fiber) {
+		const int total_count = GC_COLLECT_TOTAL_COUNT;
+		efree(context);
+		efree(stack);
+		return total_count;
+	} else {
+		GC_G(async_context).state = GC_ASYNC_STATE_NONE;
+		if (GC_G(gc_stack) != NULL) {
+			GC_G(gc_stack) = NULL;
+			efree(stack);
+		}
 	}
 #endif
 	return GC_COLLECT_TOTAL_COUNT;