From 8ea34771e4d4c41b87b678acf89e2961d36e56d4 Mon Sep 17 00:00:00 2001 From: RichieSams Date: Sun, 21 Feb 2021 21:05:21 -0500 Subject: [PATCH] Rename "Low priority" queue to "Normal priority" Mostly for connotation reasons to the user. Tasks in the second queue are going to be run. High priority tasks will just be run first. --- README.asciidoc | 2 +- benchmarks/empty/empty.cpp | 2 +- benchmarks/producer_consumer/producer_consumer.cpp | 4 ++-- examples/triangle_num.cpp | 2 +- include/ftl/task.h | 2 +- source/task_scheduler.cpp | 4 ++-- tests/functional/calc_triangle_num.cpp | 2 +- tests/functional/producer_consumer.cpp | 4 ++-- tests/utilities/event_callbacks.cpp | 2 +- tests/utilities/fibtex.cpp | 12 ++++++------ tests/utilities/thread_local.cpp | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index ce41402d..f92ad3ca 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -95,7 +95,7 @@ int main() { // Schedule the tasks ftl::TaskCounter counter(&taskScheduler); - taskScheduler.AddTasks(numTasks, tasks, ftl::TaskPriority::High, &counter); + taskScheduler.AddTasks(numTasks, tasks, ftl::TaskPriority::Normal, &counter); // FTL creates its own copies of the tasks, so we can safely delete the memory delete[] tasks; diff --git a/benchmarks/empty/empty.cpp b/benchmarks/empty/empty.cpp index 642378cf..51cbcfe2 100644 --- a/benchmarks/empty/empty.cpp +++ b/benchmarks/empty/empty.cpp @@ -47,7 +47,7 @@ NONIUS_BENCHMARK("Empty", [](nonius::chronometer meter) { meter.measure([&taskScheduler, tasks] { for (unsigned i = 0; i < kNumIterations; ++i) { ftl::TaskCounter counter(&taskScheduler); - taskScheduler.AddTasks(kNumTasks, tasks, ftl::TaskPriority::Low); + taskScheduler.AddTasks(kNumTasks, tasks, ftl::TaskPriority::Normal); taskScheduler.WaitForCounter(&counter, 0); } diff --git a/benchmarks/producer_consumer/producer_consumer.cpp b/benchmarks/producer_consumer/producer_consumer.cpp index ec5fcbe7..fca0f6b2 100644 --- a/benchmarks/producer_consumer/producer_consumer.cpp +++ b/benchmarks/producer_consumer/producer_consumer.cpp @@ -43,7 +43,7 @@ void Producer(ftl::TaskScheduler *taskScheduler, void *arg) { } ftl::TaskCounter counter(taskScheduler); - taskScheduler->AddTasks(kNumConsumerTasks, tasks, ftl::TaskPriority::Low, &counter); + taskScheduler->AddTasks(kNumConsumerTasks, tasks, ftl::TaskPriority::Normal, &counter); delete[] tasks; taskScheduler->WaitForCounter(&counter); @@ -63,7 +63,7 @@ NONIUS_BENCHMARK("ProducerConsumer", [](nonius::chronometer meter) { meter.measure([&taskScheduler, tasks] { for (unsigned i = 0; i < kNumIterations; ++i) { ftl::TaskCounter counter(&taskScheduler); - taskScheduler.AddTasks(kNumProducerTasks, tasks, ftl::TaskPriority::Low); + taskScheduler.AddTasks(kNumProducerTasks, tasks, ftl::TaskPriority::Normal); taskScheduler.WaitForCounter(&counter); } diff --git a/examples/triangle_num.cpp b/examples/triangle_num.cpp index 7ec6c13c..d5e8e65e 100644 --- a/examples/triangle_num.cpp +++ b/examples/triangle_num.cpp @@ -75,7 +75,7 @@ int main() { // Schedule the tasks ftl::TaskCounter counter(&taskScheduler); - taskScheduler.AddTasks(numTasks, tasks, ftl::TaskPriority::High, &counter); + taskScheduler.AddTasks(numTasks, tasks, ftl::TaskPriority::Normal, &counter); // FTL creates its own copies of the tasks, so we can safely delete the memory delete[] tasks; diff --git a/include/ftl/task.h b/include/ftl/task.h index 6720b322..e05eb2e5 100644 --- a/include/ftl/task.h +++ b/include/ftl/task.h @@ -37,7 +37,7 @@ struct Task { enum class TaskPriority { High, - Low, + Normal, }; } // End of namespace ftl diff --git a/source/task_scheduler.cpp b/source/task_scheduler.cpp index b3f5dd62..bc335e4b 100644 --- a/source/task_scheduler.cpp +++ b/source/task_scheduler.cpp @@ -430,7 +430,7 @@ void TaskScheduler::AddTask(Task const task, TaskPriority priority, TaskCounter const TaskBundle bundle = {task, counter}; if (priority == TaskPriority::High) { m_tls[GetCurrentThreadIndex()].HiPriTaskQueue.Push(bundle); - } else if (priority == TaskPriority::Low) { + } else if (priority == TaskPriority::Normal) { m_tls[GetCurrentThreadIndex()].LoPriTaskQueue.Push(bundle); } @@ -449,7 +449,7 @@ void TaskScheduler::AddTasks(unsigned const numTasks, Task const *const tasks, T WaitFreeQueue *queue = nullptr; if (priority == TaskPriority::High) { queue = &m_tls[GetCurrentThreadIndex()].HiPriTaskQueue; - } else if (priority == TaskPriority::Low) { + } else if (priority == TaskPriority::Normal) { queue = &m_tls[GetCurrentThreadIndex()].LoPriTaskQueue; } else { FTL_ASSERT("Unknown task priority", false); diff --git a/tests/functional/calc_triangle_num.cpp b/tests/functional/calc_triangle_num.cpp index 2ab0cfee..e30fc95d 100644 --- a/tests/functional/calc_triangle_num.cpp +++ b/tests/functional/calc_triangle_num.cpp @@ -91,7 +91,7 @@ TEST_CASE("Triangle Number", "[functional]") { // Schedule the tasks and wait for them to complete ftl::TaskCounter counter(&taskScheduler); - taskScheduler.AddTasks(static_cast(numTasks), tasks, ftl::TaskPriority::Low, &counter); + taskScheduler.AddTasks(static_cast(numTasks), tasks, ftl::TaskPriority::Normal, &counter); delete[] tasks; taskScheduler.WaitForCounter(&counter); diff --git a/tests/functional/producer_consumer.cpp b/tests/functional/producer_consumer.cpp index ecb9f525..0f392dc4 100644 --- a/tests/functional/producer_consumer.cpp +++ b/tests/functional/producer_consumer.cpp @@ -45,7 +45,7 @@ void Producer(ftl::TaskScheduler *taskScheduler, void *arg) { } ftl::TaskCounter counter(taskScheduler); - taskScheduler->AddTasks(kNumConsumerTasks, tasks, ftl::TaskPriority::Low, &counter); + taskScheduler->AddTasks(kNumConsumerTasks, tasks, ftl::TaskPriority::Normal, &counter); delete[] tasks; taskScheduler->WaitForCounter(&counter); @@ -67,7 +67,7 @@ TEST_CASE("Producer Consumer", "[functional]") { } ftl::TaskCounter counter(&taskScheduler); - taskScheduler.AddTasks(kNumProducerTasks, tasks.data(), ftl::TaskPriority::Low, &counter); + taskScheduler.AddTasks(kNumProducerTasks, tasks.data(), ftl::TaskPriority::Normal, &counter); taskScheduler.WaitForCounter(&counter); // Test to see that all tasks finished diff --git a/tests/utilities/event_callbacks.cpp b/tests/utilities/event_callbacks.cpp index ca600ee7..7f1b689d 100644 --- a/tests/utilities/event_callbacks.cpp +++ b/tests/utilities/event_callbacks.cpp @@ -120,7 +120,7 @@ TEST_CASE("Fiber Event Callbacks", "[utility]") { }; ftl::TaskCounter waitCounter(&taskScheduler); - taskScheduler.AddTask(testTask, ftl::TaskPriority::Low, &waitCounter); + taskScheduler.AddTask(testTask, ftl::TaskPriority::Normal, &waitCounter); taskScheduler.WaitForCounter(&waitCounter); diff --git a/tests/utilities/fibtex.cpp b/tests/utilities/fibtex.cpp index 856313ef..519ff877 100644 --- a/tests/utilities/fibtex.cpp +++ b/tests/utilities/fibtex.cpp @@ -73,12 +73,12 @@ TEST_CASE("Fibtex Locking Tests", "[utility]") { constexpr size_t iterations = 20000; for (size_t i = 0; i < iterations; ++i) { - taskScheduler.AddTask(ftl::Task{LockGuardTest, &md}, ftl::TaskPriority::Low, &c); - taskScheduler.AddTask(ftl::Task{LockGuardTest, &md}, ftl::TaskPriority::Low, &c); - taskScheduler.AddTask(ftl::Task{SpinLockGuardTest, &md}, ftl::TaskPriority::Low, &c); - taskScheduler.AddTask(ftl::Task{SpinLockGuardTest, &md}, ftl::TaskPriority::Low, &c); - taskScheduler.AddTask(ftl::Task{InfiniteSpinLockGuardTest, &md}, ftl::TaskPriority::Low, &c); - taskScheduler.AddTask(ftl::Task{InfiniteSpinLockGuardTest, &md}, ftl::TaskPriority::Low, &c); + taskScheduler.AddTask(ftl::Task{LockGuardTest, &md}, ftl::TaskPriority::Normal, &c); + taskScheduler.AddTask(ftl::Task{LockGuardTest, &md}, ftl::TaskPriority::Normal, &c); + taskScheduler.AddTask(ftl::Task{SpinLockGuardTest, &md}, ftl::TaskPriority::Normal, &c); + taskScheduler.AddTask(ftl::Task{SpinLockGuardTest, &md}, ftl::TaskPriority::Normal, &c); + taskScheduler.AddTask(ftl::Task{InfiniteSpinLockGuardTest, &md}, ftl::TaskPriority::Normal, &c); + taskScheduler.AddTask(ftl::Task{InfiniteSpinLockGuardTest, &md}, ftl::TaskPriority::Normal, &c); taskScheduler.WaitForCounter(&c); } diff --git a/tests/utilities/thread_local.cpp b/tests/utilities/thread_local.cpp index c0f9cd56..4ff72c75 100644 --- a/tests/utilities/thread_local.cpp +++ b/tests/utilities/thread_local.cpp @@ -62,7 +62,7 @@ TEST_CASE("Thread Local", "[utility]") { std::vector singleInitTask(taskScheduler.GetThreadCount(), ftl::Task{SimpleInit, &simpleCounter}); ftl::TaskCounter ac(&taskScheduler); - taskScheduler.AddTasks(static_cast(singleInitTask.size()), singleInitTask.data(), ftl::TaskPriority::Low, &ac); + taskScheduler.AddTasks(static_cast(singleInitTask.size()), singleInitTask.data(), ftl::TaskPriority::Normal, &ac); taskScheduler.WaitForCounter(&ac); auto singleInitVals = simpleCounter.GetAllValues(); @@ -73,7 +73,7 @@ TEST_CASE("Thread Local", "[utility]") { std::vector sideEffectTask(10000, ftl::Task{SideEffect, &sideEffectCounter}); - taskScheduler.AddTasks(static_cast(sideEffectTask.size()), sideEffectTask.data(), ftl::TaskPriority::Low, &ac); + taskScheduler.AddTasks(static_cast(sideEffectTask.size()), sideEffectTask.data(), ftl::TaskPriority::Normal, &ac); taskScheduler.WaitForCounter(&ac); auto sideEffect = sideEffectCounter.GetAllValues();