Remove need for ActorQueueSynchronization #40
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #40 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 9 9
Lines 657 666 +9
=========================================
+ Hits 657 666 +9
|
dfed
changed the title
dfed
commented
Oct 8, 2024
Sources/AsyncQueue/ActorQueue.swift
Outdated
| @@ -84,10 +71,30 @@ public final class ActorQueue<ActorType: Actor>: @unchecked Sendable { | |||
| /// **Must be called prior to enqueuing any work on the receiver.** | |||
| /// | |||
| /// - Parameter actor: The actor on which the queue's task will execute. This parameter is not retained by the receiver. | |||
| /// - Warning: Calling this method more than once will result in an assertion failure. | |||
| /// - Precondition: Calling this method more than once will result in a precondition failure. | |||
There was a problem hiding this comment.
Now that we're kicking off the stream execution here, precondition feels appropriate.
dfed
commented
Oct 8, 2024
Sources/AsyncQueue/ActorQueue.swift
Outdated
Comment on lines
79
to
97
| actor.execute { [taskStream] _ in | ||
| func beginExecuting( | ||
| _ operation: sending @escaping (isolated ActorType) async -> Void, | ||
| in context: isolated ActorType | ||
| ) { | ||
| // In Swift 6, a `Task` enqueued from an actor begins executing immediately on that actor. | ||
| // Since we're running on our actor's context due to the isolated parmater, we can just dispatch a Task to get first-enqueued-first-start task execution. | ||
| Task { | ||
| await operation(context) | ||
| } | ||
| } | ||
|
|
||
| for await actorTask in taskStream { | ||
| await beginExecuting( | ||
| actorTask.task, | ||
| in: actorTask.executionContext | ||
| ) | ||
| } | ||
| } |
There was a problem hiding this comment.
this entire closure executes within the actor context!
dfed
commented
Oct 8, 2024
Sources/AsyncQueue/ActorQueue.swift
Outdated
| extension Actor { | ||
| nonisolated | ||
| func execute( | ||
| _ task: @escaping @Sendable (isolated Self?) async -> Void |
There was a problem hiding this comment.
a bit nuts, but using (isolated Self?) enables us to isolate the closure to the actor's context without retaining the actor.
dfed
commented
Oct 8, 2024
Sources/AsyncQueue/ActorQueue.swift
Outdated
| } | ||
|
|
||
| for await actorTask in taskStream { | ||
| await beginExecuting( |
There was a problem hiding this comment.
we need to await here despite the fact that we're already isolated to the context because the compiler does not have a guarantee that actorTask.executionContext === actor`. In practice, these are always the same and therefore we do not suspend here.
dfed
changed the title
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.
We don't need to bounce through a global queue in order to ensure FIFS (first-enqueued-first-start) behavior in our ActorQueue. Instead, we just can make the async for loop await switching to the ActorType's context.
This PR is unlikely to affect performance. This PR should make this code a bit easier to follow, however.