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

Rename Nz::Functor to Nz::AbstractFunctor

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/Nazara/Core/Functor.hpp
View File

@ -13,15 +13,15 @@
namespace Nz
{
struct Functor
struct AbstractFunctor
{
virtual ~Functor() {}
virtual ~AbstractFunctor() {}
virtual void Run() = 0;
};
template<typename F>
struct FunctorWithoutArgs : Functor
struct FunctorWithoutArgs : AbstractFunctor
{
FunctorWithoutArgs(F func);
@ -32,7 +32,7 @@ namespace Nz
};
template<typename F, typename... Args>
struct FunctorWithArgs : Functor
struct FunctorWithArgs : AbstractFunctor
{
FunctorWithArgs(F func, Args&&... args);
@ -44,7 +44,7 @@ namespace Nz
};
template<typename C>
struct MemberWithoutArgs : Functor
struct MemberWithoutArgs : AbstractFunctor
{
MemberWithoutArgs(void (C::*func)(), C* object);

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

@ -29,7 +29,7 @@ namespace Nz
static void WaitForTasks();
private:
static void AddTaskFunctor(Functor* taskFunctor);
static void AddTaskFunctor(AbstractFunctor* taskFunctor);
};
}

8
include/Nazara/Renderer/TransientResources.inl
View File

@ -32,10 +32,10 @@ namespace Nz
template<typename F>
void TransientResources::PushReleaseCallback(F&& callback)
{
using Functor = ReleasableLambda<std::remove_cv_t<std::remove_reference_t<F>>>;
using ReleaseFunctor = ReleasableLambda<std::remove_cv_t<std::remove_reference_t<F>>>;
constexpr std::size_t functorSize = sizeof(Functor);
constexpr std::size_t functorAlignment = alignof(Functor);
constexpr std::size_t functorSize = sizeof(ReleaseFunctor);
constexpr std::size_t functorAlignment = alignof(ReleaseFunctor);
// Try to minimize lost space
struct
@ -77,7 +77,7 @@ namespace Nz
Block& targetBlock = *bestBlock.block;
targetBlock.resize(bestBlock.alignedOffset + functorSize);
Functor* releasable = reinterpret_cast<Functor*>(&targetBlock[bestBlock.alignedOffset]);
ReleaseFunctor* releasable = reinterpret_cast<ReleaseFunctor*>(&targetBlock[bestBlock.alignedOffset]);
PlacementNew(releasable, std::forward<F>(callback));
m_releaseQueue.push_back(releasable);

12
src/Nazara/Core/Posix/TaskSchedulerImpl.cpp
View File

@ -54,7 +54,7 @@ namespace Nz
return s_workerCount > 0;
}
void TaskSchedulerImpl::Run(Functor** tasks, unsigned int count)
void TaskSchedulerImpl::Run(AbstractFunctor** tasks, unsigned int count)
{
// On s'assure que des tâches ne sont pas déjà en cours
Wait();
@ -82,7 +82,7 @@ namespace Nz
// On réveille les threads pour qu'ils sortent de la boucle et terminent.
pthread_mutex_lock(&s_mutexQueue);
// On commence par vider la queue et demander qu'ils s'arrêtent.
std::queue<Functor*> emptyQueue;
std::queue<AbstractFunctor*> emptyQueue;
std::swap(s_tasks, emptyQueue);
s_shouldFinish = true;
pthread_cond_broadcast(&s_cvNotEmpty);
@ -114,9 +114,9 @@ namespace Nz
Wait();
}
Functor* TaskSchedulerImpl::PopQueue()
AbstractFunctor* TaskSchedulerImpl::PopQueue()
{
Functor* task = nullptr;
AbstractFunctor* task = nullptr;
pthread_mutex_lock(&s_mutexQueue);
@ -153,7 +153,7 @@ namespace Nz
// On quitte s'il doit terminer.
while (!s_shouldFinish)
{
Functor* task = PopQueue();
AbstractFunctor* task = PopQueue();
if (task)
{
@ -184,7 +184,7 @@ namespace Nz
return nullptr;
}
std::queue<Functor*> TaskSchedulerImpl::s_tasks;
std::queue<AbstractFunctor*> TaskSchedulerImpl::s_tasks;
std::unique_ptr<pthread_t[]> TaskSchedulerImpl::s_threads;
std::atomic<bool> TaskSchedulerImpl::s_isDone;
std::atomic<bool> TaskSchedulerImpl::s_isWaiting;

8
src/Nazara/Core/Posix/TaskSchedulerImpl.hpp
View File

@ -26,7 +26,7 @@
namespace Nz
{
struct Functor;
struct AbstractFunctor;
class TaskSchedulerImpl
{
@ -36,16 +36,16 @@ namespace Nz
static bool Initialize(unsigned int workerCount);
static bool IsInitialized();
static void Run(Functor** tasks, unsigned int count);
static void Run(AbstractFunctor** tasks, unsigned int count);
static void Uninitialize();
static void WaitForTasks();
private:
static Functor* PopQueue();
static AbstractFunctor* PopQueue();
static void Wait();
static void* WorkerProc(void* userdata);
static std::queue<Functor*> s_tasks;
static std::queue<AbstractFunctor*> s_tasks;
static std::unique_ptr<pthread_t[]> s_threads;
static std::atomic<bool> s_isDone;
static std::atomic<bool> s_isWaiting;

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

@ -20,7 +20,7 @@ namespace Nz
{
namespace
{
std::vector<Functor*> s_pendingWorks;
std::vector<AbstractFunctor*> s_pendingWorks;
unsigned int s_workerCount = 0;
}
@ -130,7 +130,7 @@ namespace Nz
* \remark A task containing a call on this class is undefined behaviour
*/
void TaskScheduler::AddTaskFunctor(Functor* taskFunctor)
void TaskScheduler::AddTaskFunctor(AbstractFunctor* taskFunctor)
{
if (!Initialize())
{

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;