Fix cancellation crash in adaptive #1184
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
TheAngryByrd
commented
Oct 24, 2023
| cache.Value.New() } | ||
| :> asyncaval<_> | ||
|
|
||
| map (fun a ct -> Async.StartImmediateAsTask(mapping a, ct)) input |
| @@ -628,17 +626,14 @@ module AsyncAVal = | |||
|
|
|||
| let! ct = CancellableTask.getCancellationToken () | |||
|
|
|||
| let s = | |||
| use _s = | |||
| return inner | ||
| finally | ||
| s.Dispose() | ||
| use _s = ct.Register(fun () -> it.Cancel()) |
| s2.Dispose() | ||
| finally | ||
| s.Dispose() | ||
| use _s = ct.Register(fun () -> innerCellTask.Cancel()) |
| @@ -480,43 +497,53 @@ module AsyncAVal = | |||
| let ofTask (value: Task<'a>) = ConstantVal(value) :> asyncaval<_> | |||
|
|
|||
| let ofCancellableTask (value: CancellableTask<'a>) = | |||
| let mutable cache: Option<AdaptiveCancellableTask<'a>> = None | |||
There was a problem hiding this comment.
Help cut down on re-evaluations.
| @@ -369,7 +386,7 @@ and AdaptiveCancellableTask<'a>(cancel: unit -> unit, real: Task<'a>) = | |||
| /// <summary>Will run the cancel function passed into the constructor and set the output Task to cancelled state.</summary> | |||
| member x.Cancel() = | |||
| cancel () | |||
| cts.Cancel() | |||
| cts.TryCancel() | |||
There was a problem hiding this comment.
We don't care if the cancellation can't be cancelled anymore. Alternative approaches would be to swap the cancel function out upon finishing of a task but this seemed easier.
TheAngryByrd
force-pushed
the
fix-failed-cancellations
branch
from
a32b6e9 to
18f6f58
Compare
nojaf
pushed a commit
to nojaf/FsAutoComplete
that referenced
this pull request
Nov 3, 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.
WHAT
🤖 Generated by Copilot at a32b6e9
This pull request enhances the
AdaptiveExtensionsmodule with a new type, better cancellation and disposal logic, caching, and simplification. These changes aim to improve the performance and reliability of async adaptive values, which are used for incremental and reactive computations.🤖 Generated by Copilot at a32b6e9
🛠️🚀🧹
WHY
Got this last week:
HOW
🤖 Generated by Copilot at a32b6e9
TryCancelandTryDisposeextension methods forCancellationTokenSourceto ignoreObjectDisposedException(link)TryCancelandTryDisposemethods instead ofCancelandDisposeforCancellationTokenSourceinstances inRefCountingTaskCreatorandAMaptypes (link, link)ofCancellableTaskandofAsyncfunctions inAsyncAValmodule to reuse adaptive cancellable tasks if input value has not changed (link)mapAsyncfunction inAsyncAValmodule by reusingmapfunction with a different mapping function (link)CancellationTokenRegistrationwithusekeyword inmap,map2,bind, and inner computation ofbindfunctions inAsyncAValmodule (link, link, link, link)AMapAsyncmodule (link)