Implement AsyncTimeout.cancel() #1396
Merged
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
This is a simple implementation that uses 3 booleans to keep state (inQueue, isCanceled, hadTimeoutWhenCanceled). I'd like to do a follow-up change to replace 3 booleans with a proper state variable, especially since that eliminates some impossible states (like inQueue and isCanceled).
swankjesse
commented
Dec 15, 2023
| @@ -270,24 +294,22 @@ open class AsyncTimeout : Timeout() { | |||
|
|
|||
| /** Returns true if the timeout occurred. */ | |||
| private fun cancelScheduledTimeout(node: AsyncTimeout): Boolean { | |||
There was a problem hiding this comment.
GitHub’s UI doesn’t make it obvious, but the only change in this function is moving withLock() to the callsites.
There was a problem hiding this comment.
Looks pretty good with "Hide whitespaces", although I might be biased cause I've already seen this code!
| @@ -372,9 +372,124 @@ class AsyncTimeoutTest { | |||
| assertEquals(of(*data), target.readByteString()) | |||
| } | |||
|
|
|||
| @Test | |||
| fun enterCancelSleepExit() { | |||
There was a problem hiding this comment.
I’m self-satisfied with these test names
JakeWharton
approved these changes
Dec 16, 2023
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.
This is a simple implementation that uses 3 booleans to keep state (inQueue, isCanceled, hadTimeoutWhenCanceled). I'd like to do a follow-up change to replace 3 booleans with a proper state variable, especially since that eliminates some impossible states (like inQueue and isCanceled).