#9: * fixes for Scope tests

Author: EdmondDantes

scheduler.c

@@ -719,6 +719,8 @@ void async_scheduler_main_coroutine_suspend(void)
 	if (UNEXPECTED(EG(exception) != NULL)) { \
 		if(ZEND_ASYNC_GRACEFUL_SHUTDOWN) { \
 			finally_shutdown(); \
+			switch_to_scheduler(transfer); \
+			zend_exception_restore(); \
 			return; \
 		} \
 		start_graceful_shutdown(); \

scope.c

@@ -445,6 +445,18 @@ METHOD(isClosed)
 	RETURN_BOOL(ZEND_ASYNC_SCOPE_IS_CLOSED(&scope_object->scope->scope));
 }
 
+METHOD(isCancelled)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+
+	async_scope_object_t *scope_object = THIS_SCOPE;
+	if (UNEXPECTED(scope_object->scope == NULL)) {
+		RETURN_BOOL(scope_object->is_cancelled);
+	}
+
+	RETURN_BOOL(ZEND_ASYNC_SCOPE_IS_CANCELLED(&scope_object->scope->scope));
+}
+
 METHOD(setExceptionHandler)
 {
 	zend_fcall_info fci;
@@ -889,6 +901,10 @@ static bool scope_catch_or_cancel(
 
 	ZEND_ASYNC_SCOPE_SET_CANCELLED(&async_scope->scope);
 
+	if (((async_scope_object_t *)async_scope->scope.scope_object) != NULL) {
+		((async_scope_object_t *)async_scope->scope.scope_object)->is_cancelled = true;
+	}
+
 	// If an unexpected exception occurs during the function's execution, we combine them into one.
 	if (EG(exception)) {
 		exception = zend_exception_merge(exception, true, transfer_error);
@@ -1123,7 +1139,8 @@ static void scope_dispose(zend_async_event_t *scope_event)
 		FREE_HASHTABLE(scope->finally_handlers);
 		scope->finally_handlers = NULL;
 	}
-	
+
+	zend_async_callbacks_free(&scope->scope.event);
 	async_scope_free_coroutines(scope);
 	zend_async_scope_free_children(&scope->scope);
 	efree(scope);
@@ -1148,6 +1165,7 @@ zend_async_scope_t * async_new_scope(zend_async_scope_t * parent_scope, const bo
 		}
 
 		scope_object->scope = scope;
+		scope_object->is_cancelled = false;
 		scope->scope.scope_object = &scope_object->std;
 	}
 

scope.h

@@ -60,6 +60,7 @@ typedef struct _async_scope_object_s {
 		struct {
 			char _padding[sizeof(zend_object) - sizeof(zval)];
 			async_scope_t *scope;
+			bool is_cancelled; /* Indicates if the scope is cancelled */
 		};
 	};
 } async_scope_object_t;

scope.stub.php

@@ -35,8 +35,6 @@ public function afterCoroutineEnqueue(Coroutine $coroutine, Scope $scope): void;
  */
 final class Scope implements ScopeProvider
 {
-    //public readonly Context $context;
-
     /**
      * Creates a new Scope that inherits from the specified one. If the parameter is not provided,
      * the Scope inherits from the current one.
@@ -65,6 +63,8 @@ public function isFinished(): bool {}
 
     public function isClosed(): bool {}
 
+    public function isCancelled(): bool {}
+
     /**
      * Sets an error handler that is called when an exception is passed to the Scope from one of its child coroutines.
      */

scope_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 6106b3351f8094535fee7310e1d096ed06fb813d */
+ * Stub hash: 655728a28912cc420f1fe0ae483291cff8153fdc */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Async_ScopeProvider_provideScope, 0, 0, Async\\Scope, 1)
 ZEND_END_ARG_INFO()
@@ -49,6 +49,8 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_Async_Scope_isClosed arginfo_class_Async_Scope_isFinished
 
+#define arginfo_class_Async_Scope_isCancelled arginfo_class_Async_Scope_isFinished
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Async_Scope_setExceptionHandler, 0, 1, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, exceptionHandler, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()
@@ -81,6 +83,7 @@ ZEND_METHOD(Async_Scope, awaitCompletion);
 ZEND_METHOD(Async_Scope, awaitAfterCancellation);
 ZEND_METHOD(Async_Scope, isFinished);
 ZEND_METHOD(Async_Scope, isClosed);
+ZEND_METHOD(Async_Scope, isCancelled);
 ZEND_METHOD(Async_Scope, setExceptionHandler);
 ZEND_METHOD(Async_Scope, setChildScopeExceptionHandler);
 ZEND_METHOD(Async_Scope, onFinally);
@@ -111,6 +114,7 @@ static const zend_function_entry class_Async_Scope_methods[] = {
 	ZEND_ME(Async_Scope, awaitAfterCancellation, arginfo_class_Async_Scope_awaitAfterCancellation, ZEND_ACC_PUBLIC)
 	ZEND_ME(Async_Scope, isFinished, arginfo_class_Async_Scope_isFinished, ZEND_ACC_PUBLIC)
 	ZEND_ME(Async_Scope, isClosed, arginfo_class_Async_Scope_isClosed, ZEND_ACC_PUBLIC)
+	ZEND_ME(Async_Scope, isCancelled, arginfo_class_Async_Scope_isCancelled, ZEND_ACC_PUBLIC)
 	ZEND_ME(Async_Scope, setExceptionHandler, arginfo_class_Async_Scope_setExceptionHandler, ZEND_ACC_PUBLIC)
 	ZEND_ME(Async_Scope, setChildScopeExceptionHandler, arginfo_class_Async_Scope_setChildScopeExceptionHandler, ZEND_ACC_PUBLIC)
 	ZEND_ME(Async_Scope, onFinally, arginfo_class_Async_Scope_onFinally, ZEND_ACC_PUBLIC)

tests/scope/022-scope_awaitCompletion_basic.phpt

@@ -6,6 +6,7 @@ Scope: awaitCompletion() - basic usage
 use function Async\spawn;
 use function Async\timeout;
 use Async\Scope;
+use function Async\await;
 
 echo "start\n";
 
@@ -32,7 +33,7 @@ $external = spawn(function() use ($scope) {
 });
 
 echo "awaiting external\n";
-$external->getResult();
+await($external);
 
 echo "verifying results\n";
 echo "coroutine1 result: " . $coroutine1->getResult() . "\n";
@@ -45,10 +46,10 @@ echo "end\n";
 --EXPECT--
 start
 spawned coroutines
-external waiting for scope completion
+awaiting external
 coroutine1 running
 coroutine2 running
-awaiting external
+external waiting for scope completion
 scope completed
 verifying results
 coroutine1 result: result1

tests/scope/023-scope_awaitCompletion_timeout.phpt

@@ -6,6 +6,7 @@ Scope: awaitCompletion() - timeout handling
 use function Async\spawn;
 use function Async\suspend;
 use function Async\timeout;
+use function Async\await;
 use Async\Scope;
 
 echo "start\n";
@@ -35,7 +36,7 @@ $external = spawn(function() use ($scope) {
     }
 });
 
-$external->getResult();
+await($external);
 
 // Cancel the long running coroutine to clean up
 $long_running->cancel();
@@ -48,8 +49,9 @@ echo "end\n";
 --EXPECT--
 start
 spawned long running coroutine
-external waiting with timeout
 long running coroutine started
+external waiting with timeout
+long running coroutine finished
 caught timeout as expected
 scope finished: true
 end

tests/scope/024-scope_awaitAfterCancellation_basic.phpt

@@ -6,6 +6,7 @@ Scope: awaitAfterCancellation() - basic usage
 use function Async\spawn;
 use function Async\suspend;
 use function Async\timeout;
+use function Async\await;
 use Async\Scope;
 
 echo "start\n";
@@ -31,6 +32,8 @@ $coroutine2 = $scope->spawn(function() {
 
 echo "spawned coroutines\n";
 
+suspend(); // Let coroutines start
+
 // Cancel the scope
 $scope->cancel();
 echo "scope cancelled\n";
@@ -42,7 +45,7 @@ $external = spawn(function() use ($scope) {
     echo "awaitAfterCancellation completed\n";
 });
 
-$external->getResult();
+await($external);
 
 echo "scope finished: " . ($scope->isFinished() ? "true" : "false") . "\n";
 echo "scope closed: " . ($scope->isClosed() ? "true" : "false") . "\n";

tests/scope/025-scope_awaitAfterCancellation_error_handler.phpt

@@ -6,6 +6,7 @@ Scope: awaitAfterCancellation() - with error handler
 use function Async\spawn;
 use function Async\suspend;
 use function Async\timeout;
+use function Async\await;
 use Async\Scope;
 
 echo "start\n";
@@ -15,8 +16,14 @@ $scope = Scope::inherit();
 
 $error_coroutine = $scope->spawn(function() {
     echo "error coroutine started\n";
-    suspend();
-    throw new \RuntimeException("Coroutine error");
+
+    try {
+        suspend(); // Suspend to simulate work
+    } catch (\CancellationException $e) {
+        echo "coroutine cancelled\n";
+        suspend();
+        throw new \RuntimeException("Coroutine error after cancellation");
+    }
 });
 
 $normal_coroutine = $scope->spawn(function() {
@@ -29,34 +36,28 @@ $normal_coroutine = $scope->spawn(function() {
 
 echo "spawned coroutines\n";
 
-// Cancel the scope
-$scope->cancel();
-echo "scope cancelled\n";
-
 // Await after cancellation with error handler
 $external = spawn(function() use ($scope) {
     echo "external waiting with error handler\n";
 
-    $errors_handled = [];
-    
+    // Cancel the scope
+    $scope->cancel();
+    echo "scope cancel\n";
+    suspend(); // Let cancellation propagate
+
+    echo "awaitAfterCancellation with handler started\n";
+
     $scope->awaitAfterCancellation(
-        function($errors) use (&$errors_handled) {
-            echo "error handler called\n";
-            echo "errors count: " . count($errors) . "\n";
-            foreach ($errors as $error) {
-                echo "error: " . $error->getMessage() . "\n";
-                $errors_handled[] = $error->getMessage();
-            }
+        function($error) {
+            echo "error handler called: {$error->getMessage()}\n";
         },
-        timeout(1000)
+        timeout(10)
     );
 
     echo "awaitAfterCancellation with handler completed\n";
-    return $errors_handled;
 });
 
-$handled_errors = $external->getResult();
-echo "handled errors count: " . count($handled_errors) . "\n";
+await($external);
 
 echo "scope finished: " . ($scope->isFinished() ? "true" : "false") . "\n";
 
@@ -68,12 +69,11 @@ start
 spawned coroutines
 error coroutine started
 normal coroutine started
-scope cancelled
 external waiting with error handler
-error handler called
-errors count: %d
-error: %s
+scope cancel
+coroutine cancelled
+awaitAfterCancellation with handler started
+error handler called: Coroutine error after cancellation
 awaitAfterCancellation with handler completed
-handled errors count: %d
 scope finished: true
 end

tests/scope/026-scope_cancel_with_active_coroutines.phpt

@@ -46,6 +46,9 @@ suspend();
 echo "cancelling scope\n";
 $scope->cancel(new \Async\CancellationException("Custom cancellation message"));
 
+// Let cancellation propagate
+suspend();
+
 echo "verifying cancellation\n";
 echo "scope finished: " . ($scope->isFinished() ? "true" : "false") . "\n";
 echo "scope closed: " . ($scope->isClosed() ? "true" : "false") . "\n";
@@ -60,7 +63,7 @@ try {
         return "should_not_work";
     });
     echo "ERROR: Should not be able to spawn in closed scope\n";
-} catch (Error $e) {
+} catch (Async\AsyncException $e) {
     echo "caught expected error: " . $e->getMessage() . "\n";
 }