[SourceKit] Allow explicit cancellation of requests with a cancellation token #39494
Conversation
This file contains hidden or 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
|
@swift-ci Please smoke test |
benlangmuir
reviewed
Sep 28, 2021
tools/SourceKit/tools/sourcekitd/bin/InProc/sourcekitdInProc.cpp
Outdated
Show resolved
Hide resolved
tools/SourceKit/tools/sourcekitd/bin/InProc/sourcekitdInProc.cpp
Outdated
Show resolved
Hide resolved
tools/SourceKit/tools/sourcekitd/bin/XPC/Service/XPCService.cpp
Outdated
Show resolved
Hide resolved
ahoppen
force-pushed
the
pr/sourcekit-cancellation-tokens
branch
2 times, most recently
from
95c3d7d to
649f351
Compare
|
Thanks for your feedback @benlangmuir. I addressed the comments and also moved the
|
…on token The key changes here are - To keep track of cancellation tokens for all `ScheduledConsumer`s in `SwiftASTManager` - Generate unique request handles for all incoming requests (`create_request_handle `), use these request handles as cancellation tokens and return them from the `sourcekitd_send_request` methods - Implement cancellation with `sourcekitd_cancel_request` as the entry point and `SwiftASTManager::cancelASTConsumer` as the termination point Everything else is just plumbing the cancellation token through the various abstraction layers. rdar://83391505
ahoppen
force-pushed
the
pr/sourcekit-cancellation-tokens
branch
from
649f351 to
fb26447
Compare
|
@swift-ci Please smoke test |
benlangmuir
approved these changes
Sep 30, 2021
| // We need to wait a little bit after request scheduling and cancellation to make sure we are not cancelling the request before it got scheduled. | ||
|
|
||
| // RUN: not %sourcekitd-test -req=cursor -id=slow -async -pos=10:3 %s -- %s == \ | ||
| // RUN: -shell -- sleep 1 == \ |
There was a problem hiding this comment.
I thought this would need // REQUIRES: shell, but I guess the tests passed on all platforms 🤷
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.
The key changes here are
ScheduledConsumers inSwiftASTManagercreate_request_handle), use these request handles as cancellation tokens and return them from thesourcekitd_send_requestmethodssourcekitd_cancel_requestas the entry point andSwiftASTManager::cancelASTConsumeras the termination pointEverything else is just plumbing the cancellation token through the various abstraction layers.
rdar://83391505