No longer use volatile in CTaskManager

ryzom · Mar 3, 2023 · 406ddb4 · 406ddb4
1 parent 94e15e3
commit 406ddb4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/nel/include/nel/misc/task_manager.h b/nel/include/nel/misc/task_manager.h
@@ -28,6 +28,7 @@
 
 #include "mutex.h"
 #include "thread.h"
+#include "atomic.h"
 
 namespace NLMISC {
 
@@ -139,10 +140,10 @@ class CTaskManager : public IRunnable
 	CSynchronized<std::deque<std::string> >	_DoneTaskQueue;
 
 	/// thread pointer
-	IThread *_Thread;
+	CUniquePtr<IThread> _Thread;
 
 	/// flag indicate thread loop, if false cause thread exit
-	volatile	bool _ThreadRunning;
+	CAtomicBool _ThreadRunning;
 
 private:
 
@@ -154,7 +155,7 @@ class CTaskManager : public IRunnable
 
 private:
 
-	volatile	bool _IsTaskRunning;
+	CAtomicBool _IsTaskRunning;
 
 };
 

diff --git a/nel/src/misc/task_manager.cpp b/nel/src/misc/task_manager.cpp
@@ -39,11 +39,11 @@ CTaskManager::CTaskManager() : _RunningTask (""), _TaskQueue (""), _DoneTaskQueu
 {
 	_IsTaskRunning = false;
 	_ThreadRunning = true;
+	_ChangePriorityCallback = NULL;
 	CSynchronized<string>::CAccessor currentTask(&_RunningTask);
 	currentTask.value ().clear();
-	_Thread = IThread::create(this);
+	_Thread.reset(IThread::create(this));
 	_Thread->start();
-	_ChangePriorityCallback = NULL;
 }
 
 /*
@@ -52,16 +52,19 @@ CTaskManager::CTaskManager() : _RunningTask (""), _TaskQueue (""), _DoneTaskQueu
 CTaskManager::~CTaskManager()
 {
 	_ThreadRunning = false;
-	while(!_ThreadRunning)
-		nlSleep(10);
+	try
+	{
+		_Thread->wait();
+	}
+	catch (EThread &)
+	{
+		// no exception in destructor
+	}
 
 	// There should be no remaining Tasks
 	CSynchronized<std::list<CWaitingTask> >::CAccessor acces(&_TaskQueue);
 	nlassert(acces.value().empty());
-	_Thread->wait();
-	delete _Thread;
-	_Thread = NULL;
-
+	_Thread.reset(NULL);
 }
 
 // Manage TaskQueue
@@ -127,7 +130,6 @@ void CTaskManager::run(void)
 		}
 	}
 	CBigFile::getInstance().currentThreadFinished();
-	_ThreadRunning = true;
 }
 
 // Add a task to TaskManager