Thread/ThreadPool: Unit test waitUntilFinished

Author: MorganCaron

README.md

@@ -143,12 +143,12 @@ xmake [b|build] [-vD]
 
 ### Build & Run tests
 ```console
-xmake [r|run]
+xmake [r|run] [-d|--debug]
 ```
 
 ### Watch tests
 ```console
-xmake watch -r
+xmake watch -r [-d|--debug]
 ```
 
 ### Contribute

modules/Thread/ThreadPool.mpp

@@ -25,12 +25,12 @@ export namespace CppUtils::Thread
 					.start();
 		}
 
-		ThreadPool(const ThreadPool&) = delete;
-		ThreadPool& operator=(const ThreadPool&) = delete;
-		ThreadPool(ThreadPool&&) = delete;
-		ThreadPool& operator=(ThreadPool&&) = delete;
+		inline ThreadPool(const ThreadPool&) = delete;
+		inline ThreadPool& operator=(const ThreadPool&) = delete;
+		inline ThreadPool(ThreadPool&&) = delete;
+		inline ThreadPool& operator=(ThreadPool&&) = delete;
 
-		~ThreadPool()
+		inline ~ThreadPool()
 		{
 			for (auto& worker : m_workers)
 				worker.requestStop();
@@ -57,8 +57,8 @@ export namespace CppUtils::Thread
 
 		inline auto waitUntilFinished() -> void
 		{
-			auto lockGuard = std::unique_lock{m_waitingMutex};
-			if (m_activeWorkers != 0 and not isTasksQueueEmpty())
+			if (auto lockGuard = std::unique_lock{m_waitingMutex};
+				m_activeWorkers != 0 or not isTasksQueueEmpty())
 				m_waitUntilFinishedCondition.wait(lockGuard, [this] {
 					return m_activeWorkers == 0 and isTasksQueueEmpty();
 				});
@@ -77,14 +77,6 @@ export namespace CppUtils::Thread
 			return std::empty(tasksQueueAccessor.value());
 		}
 
-		[[nodiscard]] inline auto isStopRequested() const noexcept -> bool
-		{
-			for (const auto& worker : m_workers)
-				if (worker.isStopRequested())
-					return true;
-			return false;
-		}
-
 		inline auto workerThread() -> void
 		{
 			if (isTasksQueueEmpty())
@@ -93,6 +85,7 @@ export namespace CppUtils::Thread
 				m_startWorkingCondition.wait(tasksQueueAccessor.getLockGuard());
 			}
 
+			m_activeWorkers.fetch_add(1, std::memory_order_relaxed);
 			auto task = Task{};
 			{
 				auto tasksQueueAccessor = m_tasksQueue.access();
@@ -101,8 +94,6 @@ export namespace CppUtils::Thread
 				task = std::move(tasksQueueAccessor->front());
 				tasksQueueAccessor->pop();
 			}
-
-			m_activeWorkers.fetch_add(1, std::memory_order_relaxed);
 			try
 			{
 				task();

tests/Terminal/Canvas.mpp

@@ -36,7 +36,7 @@ export namespace CppUtils::UnitTest::Terminal::Canvas
 			for (auto i = 0uz; i < 5; ++i)
 				for (auto c : chars)
 				{
-					std::this_thread::sleep_for(100ms);
+					std::this_thread::sleep_for(50ms);
 					canvas.fill(c);
 					canvas.update();
 				}
@@ -54,7 +54,7 @@ export namespace CppUtils::UnitTest::Terminal::Canvas
 			for (auto i = 0uz; i <= 100; ++i)
 			{
 				progressBar.setPercent(i);
-				std::this_thread::sleep_for(20ms);
+				std::this_thread::sleep_for(5ms);
 			}
 		});
 
@@ -95,7 +95,7 @@ export namespace CppUtils::UnitTest::Terminal::Canvas
 				canvas.print(charPosition, "O");
 
 				canvas.update();
-				std::this_thread::sleep_for(10ms);
+				std::this_thread::sleep_for(5ms);
 			}
 		});
 	}};

tests/Thread/ThreadPool.mpp

@@ -6,6 +6,7 @@ import CppUtils;
 export namespace CppUtils::UnitTest::Thread::ThreadPool
 {
 	inline auto _ = CppUtils::UnitTest::TestSuite{"Thread/ThreadPool", {"UnitTest"}, [](auto& suite) {
+		using namespace std::chrono_literals;
 		using Logger = CppUtils::Logger<"CppUtils">;
 
 		suite.addTest("0 task / 1 thread", [&] {
@@ -32,13 +33,14 @@ export namespace CppUtils::UnitTest::Thread::ThreadPool
 			suite.expect(called);
 		});
 
-		suite.addTest("1 task without future.wait()", [&] {
+		suite.addTest("waitUntilFinished", [&] {
 			auto called = std::atomic_bool{false};
 			{
 				auto threadPool = CppUtils::Thread::ThreadPool{};
-				auto future = threadPool.call([&called] {
+				threadPool.call([&called] {
 					called = true;
 				});
+				threadPool.waitUntilFinished();
 			}
 			suite.expect(called);
 		});