Fix #719: propagate cancellation to tasks in async Consumers #919
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Avasil
reviewed
Jul 2, 2019
| (out, AssignableCancelable.dummy) | ||
| (out, SingleAssignCancelable.plusOne(Cancelable { () => | ||
| out.synchronized { | ||
| isDone = false |
There was a problem hiding this comment.
Shouldn't this be isDone = true?
Avasil
reviewed
Jul 2, 2019
| @@ -31,13 +31,22 @@ import scala.concurrent.Future | |||
| private[reactive] final class ForeachAsyncConsumer[A](f: A => Task[Unit]) extends Consumer[A, Unit] { | |||
|
|
|||
| def createSubscriber(cb: Callback[Throwable, Unit], s: Scheduler): (Subscriber[A], AssignableCancelable) = { | |||
| var isDone = false | |||
| var lastCancelable = Cancelable.empty | |||
|
|
|||
| val out = new Subscriber[A] { | |||
| implicit val scheduler = s | |||
| private[this] var isDone = false | |||
There was a problem hiding this comment.
I think you've forgotten to remove it
Avasil
reviewed
Jul 2, 2019
| @@ -43,7 +45,10 @@ private[reactive] final class MapTaskConsumer[In, R, R2](source: Consumer[In, R] | |||
| try { | |||
| val task = f(value) | |||
| streamErrors = false | |||
| task.runAsync(cb) | |||
| self.synchronized { | |||
| if (!isCancelled) | |||
There was a problem hiding this comment.
I feel like we don't have to synchronize isCancelled if it's volatile (or it doesn't have to be volatile if it's only used in synchronized block)
There was a problem hiding this comment.
Yeah, I'm synchronizing access across two variables here. Volatile probably is redundant
Avasil
reviewed
Jul 2, 2019
| @@ -30,7 +30,9 @@ private[reactive] final class MapTaskConsumer[In, R, R2](source: Consumer[In, R] | |||
| extends Consumer[In, R2] { | |||
|
|
|||
| def createSubscriber(cb: Callback[Throwable, R2], s: Scheduler): (Subscriber[In], AssignableCancelable) = { | |||
| val asyncCallback = new Callback[Throwable, R] { | |||
| @volatile var lastCancelable: Cancelable = Cancelable.empty | |||
There was a problem hiding this comment.
Does it have to be volatile?
Avasil
reviewed
Jul 2, 2019
| @@ -24,6 +24,8 @@ import monix.execution.exceptions.DummyException | |||
| import monix.reactive.{BaseTestSuite, Consumer, Observable} | |||
| import scala.util.Failure | |||
|
|
|||
| import monix.execution.atomic.Atomic | |||
Avasil
approved these changes
Jul 6, 2019
|
Missing |
mdedetrich
pushed a commit
to mdedetrich/monix
that referenced
this pull request
Mar 28, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.