Merge pull request #3471 from kbucheli/propberly_close_channel_supply

properly close Channel Supply
rakudo · Feb 11, 2020 · 8390016 · 8390016
2 parents 774a839 + 6fbfc4a
commit 8390016
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/core.c/Channel.pm6 b/src/core.c/Channel.pm6
@@ -119,8 +119,11 @@ my class Channel does Awaitable {
     method Capture(Channel:D:) { self.List.Capture }
     multi method Supply(Channel:D:) {
         supply {
+            my $closed = False;
+
             # Tap the async notification for new values supply.
             whenever $!async-notify.unsanitized-supply.schedule-on($*SCHEDULER) {
+                done if $closed;
                 my Mu \got = self.poll;
                 if nqp::eqaddr(got, Nil) {
                     if $!closed_promise {
@@ -149,6 +152,7 @@ my class Channel does Awaitable {
             # `last if ...` check in this loop is still essential.
             my int $initial-items = nqp::elems($!queue);
             while $initial-items-- {
+                done if $closed;
                 my Mu \got = self.poll;
                 last if nqp::eqaddr(got, Nil);
                 emit got;
@@ -159,6 +163,10 @@ my class Channel does Awaitable {
                     ?? done()
                     !! X::AdHoc.new( payload => $!closed_promise.cause ).throw
             }
+
+            CLOSE {
+                $closed = True;
+            }
         }
     }