Clean up sendability in the bootstraps #3051
Open
+117
−73
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
FranzBusch
reviewed
Jan 13, 2025
Sources/NIOPosix/Bootstrap.swift
Outdated
| @@ -474,17 +479,17 @@ public final class ServerBootstrap { | |||
| func fireThroughPipeline(_ future: EventLoopFuture<Void>, context: ChannelHandlerContext) { | |||
| ctxEventLoop.assertInEventLoop() | |||
| assert(ctxEventLoop === context.eventLoop) | |||
| let loopBoundContext = context.loopBound | |||
| let loopBoundValues = NIOLoopBound((context: context, self: self), eventLoop: context.eventLoop) | |||
There was a problem hiding this comment.
Can't we use the assume isolated APIs here?
There was a problem hiding this comment.
Yes, we can. Updated.
FranzBusch
approved these changes
Jan 13, 2025
|
Unfortunately this has regressed allocations. For example, in |
|
Ok, hopefully #3055 should have resolved those regressions, so let's see. |
Lukasa
force-pushed
the
cb-clean-up-sendability-in-the-bootstraps
branch
2 times, most recently
from
5840d79 to
31cea7b
Compare
|
Oh, it not only resolved those regressions, but led to a benchmark improvement. That's nice! |
Lukasa
force-pushed
the
cb-clean-up-sendability-in-the-bootstraps
branch
from
d82ccfd to
296ac85
Compare
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.
Motivation:
The bootstraps are the next most obvious target for cleaning up Sendability issues. These issues are mostly just missing annotations, but there are a few places where we had actual latent threading bugs that were missed. A lot more of the control flow is made more explicit in this patch, and in general it should get a lot easier to be confident that the code is correct.
Modifications:
@Sendableannotationsselfcaptures of bootstraps, which are notSendable, and which could lead to real threading bugsstaticto avoid needing to captureselfat all.Sendableconstraints on interior generic functions.Result:
Better safety, better correctness in the bootstraps.