From 485b35684dae031ad767b0f29f09527e35ac03e7 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sun, 30 Mar 2014 19:18:42 +0200
Subject: [PATCH] Added comments and optimized TaskScheduler

Former-commit-id: 863338b4599fdee38cfebec7e9dff47b571ba203
---
 src/Nazara/Core/Win32/HardwareInfoImpl.cpp  | 2 +-
 src/Nazara/Core/Win32/TaskSchedulerImpl.cpp | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Nazara/Core/Win32/HardwareInfoImpl.cpp b/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
index 361046da7..51f720983 100644
--- a/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
+++ b/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
@@ -7,7 +7,7 @@
 #include <windows.h>
 
 #ifdef NAZARA_COMPILER_MSVC
-#include <intrin.h>
+	#include <intrin.h>
 #endif
 
 #include <Nazara/Core/Debug.hpp>
diff --git a/src/Nazara/Core/Win32/TaskSchedulerImpl.cpp b/src/Nazara/Core/Win32/TaskSchedulerImpl.cpp
index 2adf8d6d6..fc35f833c 100644
--- a/src/Nazara/Core/Win32/TaskSchedulerImpl.cpp
+++ b/src/Nazara/Core/Win32/TaskSchedulerImpl.cpp
@@ -26,6 +26,7 @@ bool NzTaskSchedulerImpl::Initialize(unsigned int workerCount)
 	s_workers.reset(new Worker[workerCount]);
 	s_workerThreads.reset(new HANDLE[workerCount]);
 
+	// L'identifiant de chaque worker doit rester en vie jusqu'à ce que chaque thread soit correctement lancé
 	std::unique_ptr<unsigned int[]> workerIDs(new unsigned int[workerCount]);
 
 	for (unsigned int i = 0; i < workerCount; ++i)
@@ -42,6 +43,7 @@ bool NzTaskSchedulerImpl::Initialize(unsigned int workerCount)
 		s_workerThreads[i] = reinterpret_cast<HANDLE>(_beginthreadex(nullptr, 0, &WorkerProc, &workerIDs[i], 0, nullptr));
 	}
 
+	// On attend que les workers se mettent en attente
 	WaitForMultipleObjects(s_workerCount, &s_doneEvents[0], true, INFINITE);
 
 	return true;
@@ -67,6 +69,7 @@ void NzTaskSchedulerImpl::Run(NzFunctor** tasks, unsigned int count)
 		worker.workCount = taskCount;
 	}
 
+	// On les lance une fois qu'ils sont tous initialisés (pour éviter qu'un worker ne passe en pause détectant une absence de travaux)
 	for (unsigned int i = 0; i < s_workerCount; ++i)
 	{
 		ResetEvent(s_doneEvents[i]);
@@ -88,6 +91,7 @@ void NzTaskSchedulerImpl::Uninitialize()
 	{
 		Worker& worker = s_workers[i];
 		worker.running = false;
+		worker.workCount = 0;
 
 		EnterCriticalSection(&worker.queueMutex);
 
@@ -177,6 +181,8 @@ unsigned int __stdcall NzTaskSchedulerImpl::WorkerProc(void* userdata)
 	SetEvent(s_doneEvents[workerID]);
 
 	Worker& worker = s_workers[workerID];
+	WaitForSingleObject(worker.wakeEvent, INFINITE);
+
 	while (worker.running)
 	{
 		NzFunctor* task = nullptr;
@@ -184,7 +190,7 @@ unsigned int __stdcall NzTaskSchedulerImpl::WorkerProc(void* userdata)
 		if (worker.workCount > 0) // Permet d'éviter d'entrer inutilement dans une section critique
 		{
 			EnterCriticalSection(&worker.queueMutex);
-			if (!worker.queue.empty())
+			if (!worker.queue.empty()) // Nécessaire car le workCount peut être tombé à zéro juste avant l'entrée dans la section critique
 			{
 				task = worker.queue.front();
 				worker.queue.pop();