fix(os): avoid recursive signal cancellation lock - #908
Open
stephenlclarke wants to merge 1 commit into
Open
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.
Summary
Avoid recursively acquiring
AsyncSignalHandler's state mutex during cancellation.cancel()previously calledAsyncStream.Continuation.finish()while holding the lock. Finishing invokes the continuation'sonTerminationcallback, which callscancel()again and can deadlock on the same non-recursive mutex.Drain the continuations and dispatch sources under the lock, clear the shared state, then finish and cancel those resources after releasing the lock. This keeps repeated cancellation idempotent while removing the recursive lock path.
Testing
swift test --filter AsyncSignalHandlerTestsResult: 1 focused regression passed. It creates multiple signal streams, cancels them, verifies both finish, and then cancels again.
Compatibility
No public API changes. Signal sources and streams are still cancelled by the same call; only the lock boundary changes.