Skip to content

A couple minor priority elevation bug fixes in TaskScheduler #1357

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
ahoppen merged 1 commit into from
May 28, 2024
Merged

A couple minor priority elevation bug fixes in TaskScheduler #1357

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 3 deletions Sources/SKCore/TaskScheduler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ public actor QueuedTask<TaskDescription: TaskDescriptionProtocol> {
private let executionStateChangedCallback: (@Sendable (QueuedTask, TaskExecutionState) async -> Void)?

init(
priority: TaskPriority? = nil,
priority: TaskPriority,
description: TaskDescription,
executionStateChangedCallback: (@Sendable (QueuedTask, TaskExecutionState) async -> Void)?
) async {
self._priority = AtomicUInt8(initialValue: priority?.rawValue ?? Task.currentPriority.rawValue)
self._priority = AtomicUInt8(initialValue: priority.rawValue)
self.description = description
self.executionStateChangedCallback = executionStateChangedCallback

Expand Down Expand Up @@ -277,6 +277,10 @@ public actor QueuedTask<TaskDescription: TaskDescriptionProtocol> {
"Elevating priority of \(self.description.forLogging) from \(self.priority.rawValue) to \(targetPriority.rawValue)"
)
}
// Awaiting the result task from a higher-priority task will eventually update `priority` through
// `withTaskPriorityChangedHandler` but that might take a while because `withTaskPriorityChangedHandler` polls.
// Since we know that the priority will be elevated, set it now. That way we don't try to elevate it again.
self.priority = targetPriority
Task(priority: targetPriority) {
await self.resultTask.value
}
Expand Down Expand Up @@ -352,7 +356,7 @@ public actor TaskScheduler<TaskDescription: TaskDescriptionProtocol> {
)? = nil
) async -> QueuedTask<TaskDescription> {
let queuedTask = await QueuedTask(
priority: priority,
priority: priority ?? Task.currentPriority,
description: taskDescription,
executionStateChangedCallback: executionStateChangedCallback
)
Expand Down