Skip to content

Commit 6d5c7b5

Browse files
committed
NFC: Rename priority set during task creation to be RequestedPriority
Radar-Id: rdar://problem/86100376
1 parent 8f2ac18 commit 6d5c7b5

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

include/swift/ABI/MetadataValues.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2032,8 +2032,9 @@ inline int descendingPriorityOrder(JobPriority lhs,
20322032
class TaskCreateFlags : public FlagSet<size_t> {
20332033
public:
20342034
enum {
2035-
Priority = 0,
2036-
Priority_width = 8,
2035+
// Priority that user specified while creating the task
2036+
RequestedPriority = 0,
2037+
RequestedPriority_width = 8,
20372038

20382039
Task_IsChildTask = 8,
20392040
// bit 9 is unused
@@ -2046,8 +2047,9 @@ class TaskCreateFlags : public FlagSet<size_t> {
20462047
explicit constexpr TaskCreateFlags(size_t bits) : FlagSet(bits) {}
20472048
constexpr TaskCreateFlags() {}
20482049

2049-
FLAGSET_DEFINE_FIELD_ACCESSORS(Priority, Priority_width, JobPriority,
2050-
getPriority, setPriority)
2050+
FLAGSET_DEFINE_FIELD_ACCESSORS(RequestedPriority, RequestedPriority_width,
2051+
JobPriority, getRequestedPriority,
2052+
setRequestedPriority)
20512053
FLAGSET_DEFINE_FLAG_ACCESSORS(Task_IsChildTask,
20522054
isChildTask,
20532055
setIsChildTask)

stdlib/public/Concurrency/Task.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ static AsyncTaskAndContext swift_task_create_commonImpl(
488488
TaskCreateFlags taskCreateFlags(rawTaskCreateFlags);
489489

490490
// Propagate task-creation flags to job flags as appropriate.
491-
JobFlags jobFlags(JobKind::Task, taskCreateFlags.getPriority());
491+
JobFlags jobFlags(JobKind::Task, taskCreateFlags.getCreationPriority());
492492
jobFlags.task_setIsChildTask(taskCreateFlags.isChildTask());
493493
if (futureResultType) {
494494
jobFlags.task_setIsFuture(true);

unittests/runtime/Actor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ static std::pair<AsyncTask*, Context*>
140140
createTaskWithContext(JobPriority priority, Fn &&fn) {
141141
auto invoke =
142142
TaskContinuationFromLambda<Fn, Context>::get(std::move(fn));
143-
TaskCreateFlags flags;
144-
flags.setPriority(priority);
145-
auto pair = swift_task_create_common(flags.getOpaqueValue(),
143+
TaskCreateFlags createFlags;
144+
createFlags.setRequestedPriority(priority);
145+
auto pair = swift_task_create_common(createFlags.getOpaqueValue(),
146146
nullptr,
147147
nullptr,
148148
invoke,

0 commit comments

Comments
 (0)