Fix await-all: $remaining shouldn't go negative.

Avoids some wasteful work as well as fixing a race.
rakudo · Jan 25, 2017 · d088e0e · d088e0e
1 parent 658958e
commit d088e0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/Awaiter.pm b/src/core/Awaiter.pm
@@ -71,7 +71,7 @@ my class Awaiter::Blocking does Awaiter {
                 my int $insert = nqp::atpos_i(indices, $i);
                 $handle.subscribe-awaiter(-> \success, \result {
                     $l.protect: {
-                        if success {
+                        if success && $remaining {
                             nqp::bindpos(results, $insert, result);
                             --$remaining;
                             $ready.signal unless $remaining;

diff --git a/src/core/ThreadPoolScheduler.pm b/src/core/ThreadPoolScheduler.pm
@@ -87,7 +87,7 @@ my class ThreadPoolScheduler does Scheduler {
                         $handle.subscribe-awaiter(-> \success, \result {
                             my int $resume;
                             $l.protect: {
-                                if success {
+                                if success && $remaining {
                                     nqp::bindpos(results, $insert, result);
                                     --$remaining;
                                     $resume = 1 unless $remaining;