Skip to content

guard assume on executor API against task-to-thread runtimes #64211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 9, 2023
Merged

guard assume on executor API against task-to-thread runtimes #64211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18d976f
guard assume on executor API against task-to-thread runtimes
kavon Mar 8, 2023
f40d90f
fix another unguarded use of MainActor
kavon Mar 8, 2023
c100fe0
guard use of `enqueueStealer` when using actors-as-locks
kavon Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions stdlib/public/Concurrency/Actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1905,7 +1905,9 @@ static void swift_task_enqueueImpl(Job *job, ExecutorRef executor) {
static void
swift_actor_escalate(DefaultActorImpl *actor, AsyncTask *task, JobPriority newPriority)
{
#if !SWIFT_CONCURRENCY_ACTORS_AS_LOCKS
return actor->enqueueStealer(task, newPriority);
#endif
}

SWIFT_CC(swift)
Expand Down
4 changes: 3 additions & 1 deletion stdlib/public/Concurrency/ExecutorAssertions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import Swift
import SwiftShims

#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
// ==== -----------------------------------------------------------------------
// MARK: Precondition executors

Expand Down Expand Up @@ -244,4 +245,5 @@ func assumeOnActorExecutor<Act: Actor, T>(
}
}

// TODO(ktoso): implement assume for distributed actors as well
// TODO(ktoso): implement assume for distributed actors as well
#endif // not SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
4 changes: 4 additions & 0 deletions stdlib/public/Concurrency/Task.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ extension Task: Equatable {
}
}

#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
@available(SwiftStdlib 5.9, *)
extension Task where Failure == Error {
@_spi(MainActorUtilities)
Expand All @@ -204,7 +205,9 @@ extension Task where Failure == Error {
return Task<Success, Error>(task)
}
}
#endif

#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
@available(SwiftStdlib 5.9, *)
extension Task where Failure == Never {
@_spi(MainActorUtilities)
Expand All @@ -223,6 +226,7 @@ extension Task where Failure == Never {
return Task(task)
}
}
#endif

// ==== Task Priority ----------------------------------------------------------

Expand Down