Repository navigation
JNI: forward CompletableFuture cancellation to Swift tasks - #10
Merged
Merged
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
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.
Problem
Cancelling a future returned by a JNI async call currently changes only the Java future's state. The underlying Swift task keeps running. The generated
thenApplyresult-conversion stage also prevents cancellation of the returned future from reaching the source future.For example:
With this change, cancelling its generated Java future also cancels the Swift task, so the suspension observes cancellation:
Swift cancellation remains cooperative. This does not interrupt an operating-system thread or wait for the task to finish.
Changes
SwiftCompletableFutureruntime implementation that owns a retained Swift task handle and cancels/releases it safely on completion or cancellation.CompletableFuture.legacyFuturebehavior unchanged.Validation
swift test --disable-experimental-prebuilts --disable-sandbox: full Swift test suite passed../gradlew :SwiftKitCore:test :Samples:SwiftJavaExtractJNISampleApp:test --no-daemon: 22 runtime-library tests and 289 JNI sample tests passed, with no failures or skips.swift-format lint --stricton changed Swift files andgit diff --checkpassed.Tested with Apple Swift 6.4 and JetBrains Runtime 25 on macOS.