Skip to content
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

[Concurrency] Fix task-to-thread model linking. #80195

Closed
wants to merge 2 commits into from
Closed

[Concurrency] Fix task-to-thread model linking. #80195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e096b7
[Concurrency] Fix task-to-thread model linking.
al45tair Mar 21, 2025
ae29deb
[Concurrency] Fix new build script.
al45tair Mar 21, 2025
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
10 changes: 10 additions & 0 deletions Runtimes/Core/Concurrency/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ add_library(swift_Concurrency
ConcurrencyHooks.cpp
EmbeddedSupport.cpp
Error.cpp
ExecutorBridge.cpp
ExecutorChecks.cpp
GlobalExecutor.cpp
Setup.cpp
Expand Down Expand Up @@ -47,6 +48,7 @@ add_library(swift_Concurrency
CheckedContinuation.swift
Clock.swift
ContinuousClock.swift
CooperativeExecutor.swift
Deque/_DequeBuffer.swift
Deque/_DequeBufferHeader.swift
Deque/_DequeSlot.swift
Expand All @@ -67,19 +69,27 @@ add_library(swift_Concurrency
Deque/Deque+UnsafeHandle.swift
Deque/UnsafeMutableBufferPointer+Utilities.swift
DiscardingTaskGroup.swift
DummyExecutor.swift
Errors.swift
Executor.swift
ExecutorAssertions.swift
ExecutorBridge.swift
GlobalActor.swift
GlobalConcurrentExecutor.swift
MainActor.swift
PartialAsyncTask.swift
PlatformExecutorDarwin.swift
PlatformExecutorLinux.swift
PlatformExecutorWindows.swift
PriorityQueue.swift
SourceCompatibilityShims.swift
SuspendingClock.swift
Task.swift
Task+PriorityEscalation.swift
Task+TaskExecutor.swift
TaskCancellation.swift
TaskGroup.swift
TaskGroup+Embedded.swift
TaskLocal.swift
TaskSleep.swift
TaskSleepDuration.swift
Expand Down
5 changes: 4 additions & 1 deletion Runtimes/Core/Concurrency/dispatch.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
find_package(dispatch QUIET REQUIRED)

target_sources(swift_Concurrency PRIVATE
DispatchGlobalExecutor.cpp)
DispatchGlobalExecutor.cpp
DispatchExecutor.swift
CFExecutor.swift
ExecutorImpl.swift)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is ExecutorImpl.swift going to be used for all executors? If so, it might make sense to include the file wholesale on the main add_library(swift_Concurrency) invocation instead of adding it separately for each executor backend.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessarily, no. The Embedded Swift build doesn't use ExecutorImpl.swift, currently.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I'd like it to, but… there are issues relating to existing users and how they're using it that we need to work out first.)

target_compile_definitions(swift_Concurrency PRIVATE
$<$<COMPILE_LANGUAGE:C,CXX>:-DSWIFT_CONCURRENCY_USES_DISPATCH=1>)
target_compile_options(swift_Concurrency PRIVATE
Expand Down
3 changes: 2 additions & 1 deletion Runtimes/Core/Concurrency/hooked.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
target_sources(swift_Concurrency PRIVATE
NonDispatchGlobalExecutor.cpp)
ExecutorImpl.swift
PlatformExecutorNone.swift)
3 changes: 2 additions & 1 deletion Runtimes/Core/Concurrency/none.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
target_sources(swift_Concurrency PRIVATE
NonDispatchGlobalExecutor.cpp)
ExecutorImpl.swift
PlatformExecutorNone.swift)
3 changes: 2 additions & 1 deletion Runtimes/Core/Concurrency/singlethreaded.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
target_sources(swift_Concurrency PRIVATE
CooperativeGlobalExecutor.cpp)
ExecutorImpl.swift
PlatformExecutorCooperative.swift)
9 changes: 2 additions & 7 deletions stdlib/public/Concurrency/Executor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@ public protocol Executor: AnyObject, Sendable {
func enqueue(_ job: consuming ExecutorJob)
#endif // !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY

#if !$Embedded && !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
// The functions below could have been added to a separate protocol,
// but doing that would then mean doing an `as?` cast in e.g.
// enqueueOnGlobalExecutor (in ExecutorBridge.swift), which is
// undesirable from a performance perspective.

#if !$Embedded
/// `true` if this is the main executor.
@available(SwiftStdlib 6.2, *)
var isMainExecutor: Bool { get }
Expand Down Expand Up @@ -125,7 +120,7 @@ extension Executor where Self: Equatable {

extension Executor {

#if !$Embedded && !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
#if !$Embedded
// This defaults to `false` so that existing third-party Executor
// implementations will work as expected.
@available(SwiftStdlib 6.2, *)
Expand Down
7 changes: 7 additions & 0 deletions stdlib/public/Concurrency/ExecutorBridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ void _swift_exit(int result) {
exit(result);
}

#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
extern "C" SWIFT_CC(swift)
SerialExecutorRef swift_getMainExecutor() {
return SerialExecutorRef::generic();
}
#endif

extern "C" SWIFT_CC(swift)
void _swift_task_checkIsolatedSwift(
HeapObject *executor,
Expand Down
15 changes: 11 additions & 4 deletions stdlib/public/Concurrency/ExecutorBridge.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Swift
@_silgen_name("_swift_exit")
internal func _exit(result: CInt)

#if !$Embedded && !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
#if !$Embedded
@available(SwiftStdlib 6.2, *)
@_silgen_name("_swift_task_isMainExecutorSwift")
internal func _isMainExecutor<E>(_ executor: E) -> Bool where E: SerialExecutor {
Expand Down Expand Up @@ -79,13 +79,20 @@ internal func _jobGetExecutorPrivateData(
_ job: Builtin.Job
) -> UnsafeMutableRawPointer

#if !$Embedded && !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
#if !$Embedded
#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
@available(SwiftStdlib 6.2, *)
@_silgen_name("swift_getMainExecutor")
internal func _getMainExecutor() -> any MainExecutor {
internal func _getMainExecutor() -> any SerialExecutor {
return MainActor.executor
}
#endif
#else
// For task-to-thread model, this is implemented in C++
@available(SwiftStdlib 6.2, *)
@_silgen_name("swift_getMainExecutor")
internal func _getMainExecutor() -> any SerialExecutor
#endif // SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
#endif // !$Embedded

@available(SwiftStdlib 6.2, *)
@_silgen_name("swift_dispatchMain")
Expand Down
24 changes: 18 additions & 6 deletions stdlib/public/Concurrency/ExecutorImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@

import Swift

#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
@available(SwiftStdlib 6.2, *)
@_silgen_name("swift_task_asyncMainDrainQueueImpl")
internal func drainMainQueue() {
#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
try! MainActor.executor.run()
_exit(result: 0)
#else
fatalError("swift_task_asyncMainDrainQueue() not supported with task-to-thread")
#endif
}
#endif

@available(SwiftStdlib 6.2, *)
@_silgen_name("swift_task_donateThreadToGlobalExecutorUntilImpl")
Expand All @@ -42,34 +44,40 @@ internal func dontateToGlobalExecutor(
}
}

#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
@available(SwiftStdlib 6.2, *)
@_silgen_name("swift_task_getMainExecutorImpl")
internal func getMainExecutor() -> UnownedSerialExecutor {
return unsafe UnownedSerialExecutor(MainActor.executor)
return unsafe _getMainExecutor().asUnownedSerialExecutor()
}

@available(SwiftStdlib 6.2, *)
@_silgen_name("swift_task_enqueueMainExecutorImpl")
internal func enqueueOnMainExecutor(job unownedJob: UnownedJob) {
#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
MainActor.executor.enqueue(unownedJob)
#else
fatalError("swift_task_enqueueMainExecutor() not supported for task-to-thread")
#endif
}
#endif

@available(SwiftStdlib 6.2, *)
@_silgen_name("swift_task_enqueueGlobalImpl")
internal func enqueueOnGlobalExecutor(job unownedJob: UnownedJob) {
Task.defaultExecutor.enqueue(unownedJob)
}

#if !$Embedded && !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
#if !$Embedded
@available(SwiftStdlib 6.2, *)
@_silgen_name("swift_task_enqueueGlobalWithDelayImpl")
internal func enqueueOnGlobalExecutor(delay: CUnsignedLongLong,
job unownedJob: UnownedJob) {
#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
Task.defaultExecutor.asSchedulable!.enqueue(ExecutorJob(unownedJob),
after: .nanoseconds(delay),
clock: .continuous)
#else
fatalError("swift_task_enqueueGlobalWithDelay() not supported for task-to-thread")
#endif
}

@available(SwiftStdlib 6.2, *)
Expand All @@ -80,6 +88,7 @@ internal func enqueueOnGlobalExecutor(seconds: CLongLong,
leewayNanoseconds: CLongLong,
clock: CInt,
job unownedJob: UnownedJob) {
#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
let delay = Duration.seconds(seconds) + Duration.nanoseconds(nanoseconds)
let leeway = Duration.seconds(leewaySeconds) + Duration.nanoseconds(leewayNanoseconds)
switch clock {
Expand All @@ -96,5 +105,8 @@ internal func enqueueOnGlobalExecutor(seconds: CLongLong,
default:
fatalError("Unknown clock ID \(clock)")
}
#else
fatalError("swift_task_enqueueGlobalWithDeadline() not supported for task-to-thread")
#endif
}
#endif