Fiber support

coroutine.h

@@ -17,6 +17,7 @@
 #define COROUTINE_H
 
 #include "php_async_api.h"
+#include <Zend/zend_fibers.h>
 #include <Zend/zend_async_API.h>
 
 /* Fiber context structure for pooling */

libuv_reactor.c

@@ -168,12 +168,12 @@ bool libuv_reactor_execute(bool no_wait)
 {
 	// OPTIMIZATION: Skip uv_run() if no libuv handles to avoid unnecessary clock_gettime() calls
 	if (!uv_loop_alive(UVLOOP)) {
-		return ZEND_ASYNC_ACTIVE_EVENT_COUNT > 0;
+		return false;
 	}
 
 	const bool has_handles = uv_run(UVLOOP, no_wait ? UV_RUN_NOWAIT : UV_RUN_ONCE);
 
-	return ZEND_ASYNC_ACTIVE_EVENT_COUNT > 0 || has_handles;
+	return has_handles && ZEND_ASYNC_ACTIVE_EVENT_COUNT > 0;
 }
 
 /* }}} */

scheduler.c

@@ -526,6 +526,47 @@ static bool resolve_deadlocks(void)
 		return false;
 	}
 
+	//
+	// Let’s count the number of coroutine-fibers that are in the YIELD state.
+	// This state differs from the regular Suspended state in that
+	// the Fiber has transferred control back to the parent coroutine.
+	//
+	zend_long fiber_coroutines_count = 0;
+
+	ZEND_HASH_FOREACH_VAL(&ASYNC_G(coroutines), value) {
+		const zend_coroutine_t *coroutine = (zend_coroutine_t *) Z_PTR_P(value);
+
+		if (ZEND_COROUTINE_IS_FIBER(coroutine)
+			&& ZEND_COROUTINE_IS_YIELD(coroutine)
+			&& coroutine->extended_data != NULL) {
+			fiber_coroutines_count++;
+		}
+	}
+	ZEND_HASH_FOREACH_END();
+
+	//
+	// If all coroutines are fiber coroutines in the SUSPENDED state,
+	// we can simply cancel them without creating a deadlock exception.
+	//
+	if (fiber_coroutines_count == real_coroutines) {
+
+		ZEND_HASH_FOREACH_VAL(&ASYNC_G(coroutines), value) {
+			zend_coroutine_t *coroutine = (zend_coroutine_t *) Z_PTR_P(value);
+
+			if (ZEND_COROUTINE_IS_FIBER(coroutine)
+				&& ZEND_COROUTINE_IS_YIELD(coroutine)
+				&& coroutine->extended_data != NULL) {
+					ZEND_ASYNC_CANCEL(coroutine, zend_create_graceful_exit(), true);
+
+				if (UNEXPECTED(EG(exception) != NULL)) {
+					return true;
+				}
+			}
+		}
+		ZEND_HASH_FOREACH_END();
+		return false;
+	}
+
 	// Create deadlock exception to be set as exit_exception
 	zend_object *deadlock_exception = async_new_exception(async_ce_deadlock_error, 
 		"Deadlock detected: no active coroutines, %u coroutines in waiting", real_coroutines);
@@ -552,7 +593,7 @@ static bool resolve_deadlocks(void)
 		ZEND_ASYNC_CANCEL(
 				&coroutine->coroutine, async_new_exception(async_ce_cancellation_exception, "Deadlock detected"), true);
 
-		if (EG(exception) != NULL) {
+		if (UNEXPECTED(EG(exception) != NULL)) {
 			return true;
 		}
 	}
@@ -1025,6 +1066,16 @@ bool async_scheduler_coroutine_enqueue(zend_coroutine_t *coroutine)
 				// save the filename and line number where the coroutine was created
 				zend_apply_current_filename_and_line(&coroutine->filename, &coroutine->lineno);
 
+				// Notify scope that a new coroutine has been enqueued
+				zend_async_scope_t *scope = coroutine->scope;
+
+				if (UNEXPECTED(scope == NULL)) {
+					// throw error if the coroutine has no scope
+					coroutine->waker->status = ZEND_ASYNC_WAKER_NO_STATUS;
+					async_throw_error("The coroutine has no scope assigned");
+					return false;
+				}
+
 				if (UNEXPECTED(zend_hash_index_add_ptr(&ASYNC_G(coroutines), ((async_coroutine_t *)coroutine)->std.handle, coroutine) == NULL)) {
 					coroutine->waker->status = ZEND_ASYNC_WAKER_IGNORED;
 					async_throw_error("Failed to add coroutine to the list");
@@ -1033,8 +1084,6 @@ bool async_scheduler_coroutine_enqueue(zend_coroutine_t *coroutine)
 
 				ZEND_ASYNC_INCREASE_COROUTINE_COUNT;
 
-				// Notify scope that a new coroutine has been enqueued
-				zend_async_scope_t *scope = coroutine->scope;
 				scope->after_coroutine_enqueue(coroutine, scope);
 				if (UNEXPECTED(EG(exception))) {
 					coroutine->waker->status = ZEND_ASYNC_WAKER_IGNORED;

tests/edge_cases/007-fiber_first_then_spawn.phpt

@@ -46,5 +46,11 @@ echo "Test completed\n";
 Test: Fiber first, then spawn
 Starting Fiber
 Inside Fiber
-Async exception caught: Cannot spawn a coroutine when async is disabled
+Fiber attempting to continue after spawn
+Inside spawned coroutine from Fiber
+Fiber suspended with: fiber suspended
+Resuming Fiber
+Coroutine completed
+Fiber resumed
+Fiber returned: fiber done
 Test completed

tests/edge_cases/008-spawn_first_then_fiber.phpt

@@ -55,7 +55,14 @@ echo "Test completed\n";
 --EXPECTF--
 Test: Spawn first, then Fiber
 Coroutine spawned, now creating Fiber
-Error caught: Cannot create a fiber while an True Async is active
-Test completed
+Starting Fiber
 Coroutine started
-Coroutine resumed
+Inside Fiber - this should conflict with active scheduler
+Coroutine resumed
+Fiber suspended with: fiber suspended
+Resuming Fiber
+Fiber resumed
+Fiber completed with: fiber done
+Getting coroutine result
+Coroutine completed with: coroutine result
+Test completed

tests/edge_cases/009-fiber_spawn_destructor.phpt

@@ -100,14 +100,18 @@ Created: SpawnInDestructor
 Starting some async operations
 Unsetting objects to trigger destructors
 Destructing: FiberInDestructor
-Error in destructor: Cannot create a fiber while an True Async is active
+Starting fiber in destructor
+Main coroutine running
+Fiber running in destructor
+Main coroutine resumed
+Fiber suspended with: destructor fiber
+Fiber resumed in destructor
+Fiber completed with: destructor done
 Destructor finished: FiberInDestructor
 Destructing: SpawnInDestructor
 Spawning coroutine in destructor
 Waiting for coroutine in destructor
-Main coroutine running
 Coroutine running in destructor
-Main coroutine resumed
 Coroutine resumed in destructor
 Coroutine completed with: destructor coroutine done
 Destructor finished: SpawnInDestructor

tests/edge_cases/011-gc_include_symtable_double_delref.phpt

@@ -0,0 +1,53 @@
+--TEST--
+GC with include in suspended coroutine - symTable double DELREF
+--FILE--
+<?php
+
+use function Async\spawn;
+use function Async\suspend;
+use function Async\await;
+
+class Cycle {
+    public $self;
+}
+
+try {
+    $coroutine = spawn(function() {
+        $parent1 = "value1";
+        $parent2 = "value2";
+
+        for ($i = 0; $i < 10000; $i++) {
+            $obj = new Cycle();
+            $obj->self = $obj;
+        }
+
+        // Suspend - coroutine is now in suspended state
+        suspend();
+
+        // Include inherits parent symTable
+        // Bug: GC may add same variables twice -> double DELREF
+        include __DIR__ . '/011-gc_include_symtable_double_delref_included.inc';
+
+        echo "parent1: {$parent1}\n";
+        echo "parent2: {$parent2}\n";
+        echo "included: {$included}\n";
+
+        return "done";
+    });
+
+    $result = await($coroutine);
+    echo "result: {$result}\n";
+
+} catch (Error $e) {
+    echo "Error: " . $e->getMessage() . "\n";
+}
+
+echo "OK\n";
+gc_collect_cycles();
+?>
+--EXPECTF--
+parent1: value1
+parent2: value2
+included: included_value
+result: done
+OK

tests/edge_cases/011-gc_include_symtable_double_delref_included.inc

@@ -0,0 +1,3 @@
+<?php
+// Included file for GC test
+$included = "included_value";

tests/fiber/001-fiber_with_coroutine_basic.phpt

@@ -0,0 +1,39 @@
+--TEST--
+Fiber with coroutine: Basic fiber creation and execution when async is active
+--FILE--
+<?php
+
+use function Async\spawn;
+use function Async\await;
+
+echo "Test: Fiber creation with active async scheduler\n";
+
+$coroutine = spawn(function() {
+    echo "Coroutine started\n";
+
+    // Create a fiber while async scheduler is active
+    $fiber = new Fiber(function() {
+        echo "Fiber executing\n";
+        return "fiber result";
+    });
+
+    echo "Starting fiber\n";
+    $result = $fiber->start();
+    echo "Fiber returned: " . $result . "\n";
+
+    return "coroutine result";
+});
+
+$result = await($coroutine);
+echo "Coroutine completed with: " . $result . "\n";
+
+echo "Test completed\n";
+?>
+--EXPECT--
+Test: Fiber creation with active async scheduler
+Coroutine started
+Starting fiber
+Fiber executing
+Fiber returned: fiber result
+Coroutine completed with: coroutine result
+Test completed

tests/fiber/002-fiber_simple_return.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Fiber with simple return without suspend
+--FILE--
+<?php
+
+use function Async\spawn;
+use function Async\await;
+
+echo "Test: Fiber simple return without suspend\n";
+
+$coroutine = spawn(function() {
+    $fiber = new Fiber(function() {
+        echo "Fiber executing\n";
+        return "result from fiber";
+    });
+
+    $result = $fiber->start();
+    echo "Got: " . $result . "\n";
+
+    return "coroutine done";
+});
+
+await($coroutine);
+echo "Test completed\n";
+?>
+--EXPECT--
+Test: Fiber simple return without suspend
+Fiber executing
+Got: result from fiber
+Test completed

tests/fiber/003-fiber_one_suspend_resume.phpt

@@ -0,0 +1,37 @@
+--TEST--
+One suspend/resume cycle
+--FILE--
+<?php
+
+use function Async\spawn;
+use function Async\await;
+
+echo "Test: One suspend/resume cycle\n";
+
+$coroutine = spawn(function() {
+    $fiber = new Fiber(function() {
+        echo "Before suspend\n";
+        $value = Fiber::suspend("suspended");
+        echo "After resume, got: " . $value . "\n";
+        return "done";
+    });
+
+    $suspended = $fiber->start();
+    echo "Fiber suspended with: " . $suspended . "\n";
+
+    $result = $fiber->resume("resume value");
+    echo "Fiber returned: " . $result . "\n";
+
+    return "complete";
+});
+
+await($coroutine);
+echo "Test completed\n";
+?>
+--EXPECT--
+Test: One suspend/resume cycle
+Before suspend
+Fiber suspended with: suspended
+After resume, got: resume value
+Fiber returned: done
+Test completed

tests/fiber/004-fiber_multiple_suspends.phpt

@@ -0,0 +1,45 @@
+--TEST--
+Multiple suspend/resume cycles
+--FILE--
+<?php
+
+use function Async\spawn;
+use function Async\await;
+
+echo "Test: Multiple suspend/resume cycles\n";
+
+$coroutine = spawn(function() {
+    $fiber = new Fiber(function() {
+        $v1 = Fiber::suspend("suspend-1");
+        echo "Got: " . $v1 . "\n";
+
+        $v2 = Fiber::suspend("suspend-2");
+        echo "Got: " . $v2 . "\n";
+
+        $v3 = Fiber::suspend("suspend-3");
+        echo "Got: " . $v3 . "\n";
+
+        return "final";
+    });
+
+    echo "R1: " . $fiber->start() . "\n";
+    echo "R2: " . $fiber->resume("resume-1") . "\n";
+    echo "R3: " . $fiber->resume("resume-2") . "\n";
+    echo "R4: " . $fiber->resume("resume-3") . "\n";
+
+    return "done";
+});
+
+await($coroutine);
+echo "Test completed\n";
+?>
+--EXPECT--
+Test: Multiple suspend/resume cycles
+R1: suspend-1
+Got: resume-1
+R2: suspend-2
+Got: resume-2
+R3: suspend-3
+Got: resume-3
+R4: final
+Test completed