Merge pull request #82457 from al45tair/external-executor-test-support

[Concurrency] Add functions to allow testing of external executors.

Author: al45tair

include/swift/ABI/Task.h

@@ -154,6 +154,10 @@ class alignas(2 * alignof(void*)) Job :
     return Flags.getPriority();
   }
 
+  void setPriority(JobPriority priority) {
+    Flags.setPriority(priority);
+  }
+
   uint32_t getJobId() const {
     return Id;
   }

stdlib/public/Concurrency/ExecutorBridge.cpp

@@ -54,6 +54,11 @@ uint8_t swift_job_getPriority(Job *job) {
   return (uint8_t)(job->getPriority());
 }
 
+extern "C" SWIFT_CC(swift)
+void swift_job_setPriority(Job *job, uint8_t priority) {
+  job->setPriority(JobPriority(priority));
+}
+
 extern "C" SWIFT_CC(swift)
 uint8_t swift_job_getKind(Job *job) {
   return (uint8_t)(job->Flags.getKind());

stdlib/public/Concurrency/ExecutorBridge.swift

@@ -77,6 +77,10 @@ internal func _jobDeallocate(_ job: Builtin.Job,
 @_silgen_name("swift_job_getPriority")
 internal func _jobGetPriority(_ job: Builtin.Job) -> UInt8
 
+@available(StdlibDeploymentTarget 6.2, *)
+@_silgen_name("swift_job_setPriority")
+internal func _jobSetPriority(_ job: Builtin.Job, _ priority: UInt8)
+
 @available(StdlibDeploymentTarget 6.2, *)
 @_silgen_name("swift_job_getKind")
 internal func _jobGetKind(_ job: Builtin.Job) -> UInt8

stdlib/public/Concurrency/PartialAsyncTask.swift

@@ -298,14 +298,23 @@ public struct ExecutorJob: Sendable, ~Copyable {
     self.context = job.context
   }
 
-  public var priority: JobPriority {
-    let raw: UInt8
-    if #available(StdlibDeploymentTarget 6.2, *) {
-      raw = _jobGetPriority(self.context)
-    } else {
-      fatalError("we shouldn't get here; if we have, availability is broken")
+  internal(set) public var priority: JobPriority {
+    get {
+      let raw: UInt8
+      if #available(StdlibDeploymentTarget 6.2, *) {
+        raw = _jobGetPriority(self.context)
+      } else {
+        fatalError("we shouldn't get here; if we have, availability is broken")
+      }
+      return JobPriority(rawValue: raw)
+    }
+    set {
+      if #available(StdlibDeploymentTarget 6.2, *) {
+        _jobSetPriority(self.context, newValue.rawValue)
+      } else {
+        fatalError("we shouldn't get here; if we have, availability is broken")
+      }
     }
-    return JobPriority(rawValue: raw)
   }
 
   /// Execute a closure, passing it the bounds of the executor private data
@@ -540,6 +549,16 @@ public struct JobPriority: Sendable {
 
   /// The raw priority value.
   public var rawValue: RawValue
+
+  /// Construct from a raw value
+  public init(rawValue: RawValue) {
+    self.rawValue = rawValue
+  }
+
+  /// Construct from a TaskPriority
+  public init(_ p: TaskPriority) {
+    self.rawValue = p.rawValue
+  }
 }
 
 @available(SwiftStdlib 5.9, *)
@@ -909,3 +928,17 @@ public func _unsafeInheritExecutor_withUnsafeThrowingContinuation<T>(
 public func _abiEnableAwaitContinuation() {
   fatalError("never use this function")
 }
+
+@available(StdlibDeploymentTarget 6.2, *)
+@_silgen_name("_swift_createJobForTestingOnly")
+public func _swift_createJobForTestingOnly(
+  priority: TaskPriority = TaskPriority.medium,
+  _ body: @escaping () -> ()
+) -> ExecutorJob {
+  let flags: Int = Int(priority.rawValue)
+  let (task, _) = Builtin.createAsyncTask(flags, body)
+  var job = ExecutorJob(unsafe unsafeBitCast(Builtin.convertTaskToJob(task),
+      to: UnownedJob.self))
+  job.priority = JobPriority(priority)
+  return job
+}

test/abi/Inputs/macOS/arm64/concurrency/baseline

@@ -471,6 +471,7 @@ _$ss11JobPriorityV2eeoiySbAB_ABtFZ
 _$ss11JobPriorityV2geoiySbAB_ABtFZ
 _$ss11JobPriorityV2leoiySbAB_ABtFZ
 _$ss11JobPriorityV2neoiySbAB_ABtFZ
+_$ss11JobPriorityV8rawValueABs5UInt8V_tcfC
 _$ss11JobPriorityV8rawValues5UInt8VvM
 _$ss11JobPriorityV8rawValues5UInt8Vvg
 _$ss11JobPriorityV8rawValues5UInt8VvpMV
@@ -480,6 +481,7 @@ _$ss11JobPriorityVMn
 _$ss11JobPriorityVN
 _$ss11JobPriorityVSLsMc
 _$ss11JobPriorityVSQsMc
+_$ss11JobPriorityVyABScPcfC
 _$ss12MainExecutorMp
 _$ss12MainExecutorPScfTb
 _$ss12MainExecutorPs07RunLoopB0Tb
@@ -1180,6 +1182,7 @@ __swift_concurrency_debug_non_future_adapter
 __swift_concurrency_debug_supportsPriorityEscalation
 __swift_concurrency_debug_task_future_wait_resume_adapter
 __swift_concurrency_debug_task_wait_throwing_resume_adapter
+__swift_createJobForTestingOnly
 _swift_asyncLet_begin
 _swift_asyncLet_consume
 _swift_asyncLet_consume_throwing

test/abi/Inputs/macOS/arm64/concurrency/baseline-asserts

@@ -471,6 +471,7 @@ _$ss11JobPriorityV2eeoiySbAB_ABtFZ
 _$ss11JobPriorityV2geoiySbAB_ABtFZ
 _$ss11JobPriorityV2leoiySbAB_ABtFZ
 _$ss11JobPriorityV2neoiySbAB_ABtFZ
+_$ss11JobPriorityV8rawValueABs5UInt8V_tcfC
 _$ss11JobPriorityV8rawValues5UInt8VvM
 _$ss11JobPriorityV8rawValues5UInt8Vvg
 _$ss11JobPriorityV8rawValues5UInt8VvpMV
@@ -480,6 +481,7 @@ _$ss11JobPriorityVMn
 _$ss11JobPriorityVN
 _$ss11JobPriorityVSLsMc
 _$ss11JobPriorityVSQsMc
+_$ss11JobPriorityVyABScPcfC
 _$ss12MainExecutorMp
 _$ss12MainExecutorPScfTb
 _$ss12MainExecutorPs07RunLoopB0Tb
@@ -1180,6 +1182,7 @@ __swift_concurrency_debug_non_future_adapter
 __swift_concurrency_debug_supportsPriorityEscalation
 __swift_concurrency_debug_task_future_wait_resume_adapter
 __swift_concurrency_debug_task_wait_throwing_resume_adapter
+__swift_createJobForTestingOnly
 _swift_asyncLet_begin
 _swift_asyncLet_consume
 _swift_asyncLet_consume_throwing

test/abi/Inputs/macOS/x86_64/concurrency/baseline

@@ -471,6 +471,7 @@ _$ss11JobPriorityV2eeoiySbAB_ABtFZ
 _$ss11JobPriorityV2geoiySbAB_ABtFZ
 _$ss11JobPriorityV2leoiySbAB_ABtFZ
 _$ss11JobPriorityV2neoiySbAB_ABtFZ
+_$ss11JobPriorityV8rawValueABs5UInt8V_tcfC
 _$ss11JobPriorityV8rawValues5UInt8VvM
 _$ss11JobPriorityV8rawValues5UInt8Vvg
 _$ss11JobPriorityV8rawValues5UInt8VvpMV
@@ -480,6 +481,7 @@ _$ss11JobPriorityVMn
 _$ss11JobPriorityVN
 _$ss11JobPriorityVSLsMc
 _$ss11JobPriorityVSQsMc
+_$ss11JobPriorityVyABScPcfC
 _$ss12MainExecutorMp
 _$ss12MainExecutorPScfTb
 _$ss12MainExecutorPs07RunLoopB0Tb
@@ -1180,6 +1182,7 @@ __swift_concurrency_debug_non_future_adapter
 __swift_concurrency_debug_supportsPriorityEscalation
 __swift_concurrency_debug_task_future_wait_resume_adapter
 __swift_concurrency_debug_task_wait_throwing_resume_adapter
+__swift_createJobForTestingOnly
 _swift_asyncLet_begin
 _swift_asyncLet_consume
 _swift_asyncLet_consume_throwing

test/abi/Inputs/macOS/x86_64/concurrency/baseline-asserts

@@ -471,6 +471,7 @@ _$ss11JobPriorityV2eeoiySbAB_ABtFZ
 _$ss11JobPriorityV2geoiySbAB_ABtFZ
 _$ss11JobPriorityV2leoiySbAB_ABtFZ
 _$ss11JobPriorityV2neoiySbAB_ABtFZ
+_$ss11JobPriorityV8rawValueABs5UInt8V_tcfC
 _$ss11JobPriorityV8rawValues5UInt8VvM
 _$ss11JobPriorityV8rawValues5UInt8Vvg
 _$ss11JobPriorityV8rawValues5UInt8VvpMV
@@ -480,6 +481,7 @@ _$ss11JobPriorityVMn
 _$ss11JobPriorityVN
 _$ss11JobPriorityVSLsMc
 _$ss11JobPriorityVSQsMc
+_$ss11JobPriorityVyABScPcfC
 _$ss12MainExecutorMp
 _$ss12MainExecutorPScfTb
 _$ss12MainExecutorPs07RunLoopB0Tb
@@ -1180,6 +1182,7 @@ __swift_concurrency_debug_non_future_adapter
 __swift_concurrency_debug_supportsPriorityEscalation
 __swift_concurrency_debug_task_future_wait_resume_adapter
 __swift_concurrency_debug_task_wait_throwing_resume_adapter
+__swift_createJobForTestingOnly
 _swift_asyncLet_begin
 _swift_asyncLet_consume
 _swift_asyncLet_consume_throwing