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

Rename Nz::Functor to Nz::AbstractFunctor

Browse Source
This commit is contained in:
SirLynix
2023-11-17 13:19:21 +01:00
parent da49b39465
commit f2e77fb8a5
8 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nazara/Core/Win32/TaskSchedulerImpl.cpp
View File

@@ -59,7 +59,7 @@ namespace Nz
return s_workerCount > 0;
}
void TaskSchedulerImpl::Run(Functor** tasks, std::size_t count)
void TaskSchedulerImpl::Run(AbstractFunctor** tasks, std::size_t count)
{
// On s'assure que des tâches ne sont pas déjà en cours
WaitForMultipleObjects(s_workerCount, &s_doneEvents[0], true, INFINITE);
@@ -104,7 +104,7 @@ namespace Nz
EnterCriticalSection(&worker.queueMutex);
std::queue<Functor*> emptyQueue;
std::queue<AbstractFunctor*> emptyQueue;
std::swap(worker.queue, emptyQueue); // Et on vide la queue (merci std::swap)
LeaveCriticalSection(&worker.queueMutex);
@@ -145,7 +145,7 @@ namespace Nz
WaitForMultipleObjects(s_workerCount, &s_doneEvents[0], true, INFINITE);
}
Functor* TaskSchedulerImpl::StealTask(std::size_t workerID)
AbstractFunctor* TaskSchedulerImpl::StealTask(std::size_t workerID)
{
bool shouldRetry;
do
@@ -162,7 +162,7 @@ namespace Nz
// Ce worker a-t-il encore des tâches dans sa file d'attente ?
if (worker.workCount > 0)
{
Functor* task = nullptr;
AbstractFunctor* task = nullptr;
// Est-ce qu'il utilise la queue maintenant ?
if (TryEnterCriticalSection(&worker.queueMutex))
@@ -203,7 +203,7 @@ namespace Nz
while (worker.running)
{
Functor* task = nullptr;
AbstractFunctor* task = nullptr;
if (worker.workCount > 0) // Permet d'éviter d'entrer inutilement dans une section critique
{

6
src/Nazara/Core/Win32/TaskSchedulerImpl.hpp
View File

@@ -24,18 +24,18 @@ namespace Nz
static bool Initialize(std::size_t workerCount);
static bool IsInitialized();
static void Run(Functor** tasks, std::size_t count);
static void Run(AbstractFunctor** tasks, std::size_t count);
static void Uninitialize();
static void WaitForTasks();
private:
static Functor* StealTask(std::size_t workerID);
static AbstractFunctor* StealTask(std::size_t workerID);
static unsigned int __stdcall WorkerProc(void* userdata);
struct Worker
{
std::atomic_size_t workCount;
std::queue<Functor*> queue;
std::queue<AbstractFunctor*> queue;
CRITICAL_SECTION queueMutex;
HANDLE wakeEvent;
volatile bool running;