#53: * fix await iterator logic

Author: EdmondDantes

async_API.c

@@ -610,7 +610,8 @@ static void await_iterator_dispose(async_await_iterator_t *iterator, async_itera
 		iterator->zend_iterator = NULL;
 
 		// When the iterator has finished, it’s now possible to specify the exact number of elements since it’s known.
-		iterator->await_context->total = iterator->await_context->futures_count;
+		iterator->await_context->total = iterator->await_context->futures_count +
+										 iterator->await_context->resolved_count;
 
 		// Scenario: the iterator has already finished, and there’s nothing left to await.
 		// In that case, the coroutine needs to be terminated.

scheduler.c

@@ -1289,7 +1289,8 @@ ZEND_STACK_ALIGNED void fiber_entry(zend_fiber_transfer *transfer)
 		bool was_executed = false;
 		switch_status status = COROUTINE_NOT_EXISTS;
 
-		const circular_buffer_t * coroutine_queue = &ASYNC_G(coroutine_queue);
+		const circular_buffer_t *coroutine_queue = &ASYNC_G(coroutine_queue);
+		const circular_buffer_t *resumed_coroutines = &ASYNC_G(resumed_coroutines);
 
 		do {
 
@@ -1305,7 +1306,7 @@ ZEND_STACK_ALIGNED void fiber_entry(zend_fiber_transfer *transfer)
 			has_next_coroutine = circular_buffer_count(coroutine_queue) > 0;
 			has_handles = ZEND_ASYNC_REACTOR_EXECUTE(has_next_coroutine);
 
-			if (circular_buffer_is_not_empty(&ASYNC_G(resumed_coroutines))) {
+			if (circular_buffer_is_not_empty(resumed_coroutines)) {
 				process_resumed_coroutines();
 			}
 

tests/await/008-awaitFirstSuccess_basic.phpt

@@ -11,7 +11,7 @@ echo "start\n";
 
 $coroutines = [
     spawn(function() {
-        suspend();
+        //suspend();
         throw new RuntimeException("first error");
     }),
     spawn(function() {

tests/await/016-awaitAnyOf_basic.phpt

@@ -14,7 +14,6 @@ $coroutines = [
         return "first";
     }),
     spawn(function() {
-        suspend();
         throw new RuntimeException("test exception");
     }),
     spawn(function() {

tests/await/043-awaitAnyOfOrFail_associative_array.phpt

@@ -30,7 +30,7 @@ $coroutines = [
 
 echo "start\n";
 
-$results = awaitAnyOfOrFail(2, $coroutines);
+$results = awaitAnyOfOrFail(3, $coroutines);
 
 echo "Keys preserved: " . (count(array_intersect(array_keys($results), ['slow', 'fast', 'medium', 'very_slow'])) == count($results) ? "YES" : "NO") . "\n";