sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/TaskScheduler: Another try to remove race condition

This commit is contained in:
SirLynix 2024-02-04 13:04:29 +01:00
parent c148bc2851
commit 44617bd14d
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Core/TaskScheduler.hpp
View File

@ -42,7 +42,6 @@ namespace Nz
Worker& GetWorker(unsigned int workerIndex); Worker& GetWorker(unsigned int workerIndex);
void NotifyTaskCompletion(); void NotifyTaskCompletion();
std::atomic_bool m_idle;
std::atomic_uint m_remainingTasks; std::atomic_uint m_remainingTasks;
std::size_t m_nextWorkerIndex; std::size_t m_nextWorkerIndex;
std::vector<Worker> m_workers; std::vector<Worker> m_workers;

22
src/Nazara/Core/TaskScheduler.cpp
View File

@ -203,7 +203,6 @@ namespace Nz
NAZARA_WARNING_POP() NAZARA_WARNING_POP()
TaskScheduler::TaskScheduler(unsigned int workerCount) : TaskScheduler::TaskScheduler(unsigned int workerCount) :
m_idle(false),
m_remainingTasks(0), m_remainingTasks(0),
m_nextWorkerIndex(0), m_nextWorkerIndex(0),
m_tasks(256 * sizeof(Task)), m_tasks(256 * sizeof(Task)),
@ -227,8 +226,6 @@ namespace Nz
void TaskScheduler::AddTask(Task&& task) void TaskScheduler::AddTask(Task&& task)
{ {
m_idle = false;
std::size_t taskIndex; //< not used std::size_t taskIndex; //< not used
Task* taskPtr = m_tasks.Allocate(taskIndex, std::move(task)); Task* taskPtr = m_tasks.Allocate(taskIndex, std::move(task));
@ -248,7 +245,19 @@ namespace Nz
void TaskScheduler::WaitForTasks() void TaskScheduler::WaitForTasks()
{ {
m_idle.wait(false); // Wait until remaining task counter reaches 0
for (;;)
{
// Load and test current value
unsigned int remainingTasks = m_remainingTasks.load();
if (remainingTasks == 0)
break;
// If task count isn't 0, wait until it's signaled
// (we need to retest remainingTasks because a worker can signal m_remainingTasks while we're still adding tasks)
m_remainingTasks.wait(remainingTasks);
}
m_tasks.Clear(); m_tasks.Clear();
} }
@ -260,9 +269,6 @@ namespace Nz
void TaskScheduler::NotifyTaskCompletion() void TaskScheduler::NotifyTaskCompletion()
{ {
if (--m_remainingTasks == 0) if (--m_remainingTasks == 0)
{ m_remainingTasks.notify_one();
m_idle = true;
m_idle.notify_one();
}
} }
} }

2
tests/UnitTests/Engine/Core/TaskSchedulerTests.cpp
View File

@ -39,7 +39,7 @@ SCENARIO("TaskScheduler", "[CORE][TaskScheduler]")
Nz::Time elapsedTime = clock.GetElapsedTime(); Nz::Time elapsedTime = clock.GetElapsedTime();
CHECK(count == scheduler.GetWorkerCount()); CHECK(count == scheduler.GetWorkerCount());
CHECK(elapsedTime < Nz::Time::Milliseconds(scheduler.GetWorkerCount() * 100)); CHECK(elapsedTime < Nz::Time::Milliseconds(std::max(scheduler.GetWorkerCount(), 2u) * 100));
} }
WHEN("We add a lot of tasks and wait for all of them") WHEN("We add a lot of tasks and wait for all of them")