Fix multiple data race

Author: MorganCaron

modules/FileSystem/File.mpp

@@ -9,8 +9,7 @@ export namespace CppUtils::FileSystem
 		auto&& function,
 		bool recursively = false) -> void
 	{
-		if (not std::filesystem::exists(directoryPath) or
-			not std::filesystem::is_directory(directoryPath))
+		if (not std::filesystem::exists(directoryPath) or not std::filesystem::is_directory(directoryPath))
 			return;
 		if (recursively)
 		{

modules/Terminal/AreaBuffer.mpp

@@ -11,7 +11,7 @@ export namespace CppUtils::Terminal
 	public:
 		[[nodiscard]] virtual auto getChar(const Container::Size2& position) const noexcept -> const CharAttributes& = 0;
 		virtual auto setChar(const Container::Size2& position, const CharAttributes& c) noexcept -> void = 0;
-		[[nodiscard]] virtual auto getSize() const noexcept -> const Container::Size2& = 0;
+		[[nodiscard]] virtual auto getSize() const noexcept -> Container::Size2 = 0;
 
 		[[nodiscard]] inline virtual auto toString() const -> std::string
 		{

modules/Terminal/Canvas.mpp

@@ -171,6 +171,7 @@ export namespace CppUtils::Terminal
 
 			inline auto print() noexcept -> void
 			{
+				auto lock = std::scoped_lock{m_printMutex};
 				if (m_widget)
 				{
 					auto view = WritableAreaView{*this, m_viewport};
@@ -197,6 +198,7 @@ export namespace CppUtils::Terminal
 			}
 
 		private:
+			std::mutex m_printMutex;
 			bool m_firstPrint = true;
 			std::atomic_bool m_stopEvent = false;
 			DynamicAreaBuffer m_previousBuffer;

modules/Terminal/DynamicAreaBuffer.mpp

@@ -28,22 +28,26 @@ export namespace CppUtils::Terminal
 
 		inline auto setSize(const Container::Size2& size) noexcept -> void
 		{
+			auto lock = std::unique_lock{m_mutex};
 			m_size = size;
 			m_buffer = Buffer{m_size.height(), Line{m_size.width()}};
 		}
 
-		[[nodiscard]] inline auto getSize() const noexcept -> const Container::Size2& final
+		[[nodiscard]] inline auto getSize() const noexcept -> Container::Size2 final
 		{
+			auto lock = std::unique_lock{m_mutex};
 			return m_size;
 		}
 
 		[[nodiscard]] auto getChar(const Container::Size2& position) const noexcept -> const CharAttributes& final
 		{
+			auto lock = std::unique_lock{m_mutex};
 			return m_buffer[position.y()][position.x()];
 		}
 
 		auto setChar(const Container::Size2& position, const CharAttributes& c) noexcept -> void final
 		{
+			auto lock = std::unique_lock{m_mutex};
 			if (position.x() >= m_size.width() or position.y() >= m_size.height())
 				return;
 			m_buffer[position.y()][position.x()] = c;
@@ -55,6 +59,7 @@ export namespace CppUtils::Terminal
 		}
 
 	private:
+		mutable std::mutex m_mutex;
 		Container::Size2 m_size;
 		Buffer m_buffer;
 	};

modules/Terminal/FixedAreaBuffer.mpp

@@ -15,7 +15,7 @@ export namespace CppUtils::Terminal
 		using Buffer = std::array<Line, Height>;
 		static constexpr auto size = Container::Size2{Width, Height};
 
-		[[nodiscard]] inline constexpr auto getSize() const noexcept -> const Container::Size2& override
+		[[nodiscard]] inline constexpr auto getSize() const noexcept -> Container::Size2 override
 		{
 			return size;
 		}

modules/Thread/Scheduler.mpp

@@ -169,7 +169,7 @@ export namespace CppUtils::Thread
 				}
 			}
 
-			if (tasksToRun.empty())
+			if (std::empty(tasksToRun))
 				return;
 
 			m_processingTasks += std::size(tasksToRun);

tests/Terminal/Canvas.mpp

@@ -73,7 +73,7 @@ export namespace CppUtils::UnitTest::Terminal::Canvas
 			auto scheduler = CppUtils::Thread::Scheduler{};
 			scheduler.schedule([&canvas]() mutable {
 				canvas.close();
-			}, 1s);
+			}, 500ms);
 
 			for (auto i = 0.f; i <= 100.f; i += 1.f)
 			{

tests/Thread/Scheduler.mpp

@@ -103,7 +103,11 @@ export namespace CppUtils::UnitTest::Thread::Scheduler
 		suite.addTest("Order of execution", [&] {
 			auto scheduler = CppUtils::Thread::Scheduler{};
 			auto executionOrder = std::vector<std::size_t>{};
-			auto record = [&](std::size_t value) { executionOrder.push_back(value); };
+			auto mutex = std::mutex{};
+			auto record = [&](std::size_t value) {
+				auto lock = std::unique_lock{mutex};
+				executionOrder.push_back(value);
+			};
 
 			scheduler.schedule([&] { record(1); }, 100ms);
 			scheduler.schedule([&] { record(2); }, 50ms);
@@ -121,8 +125,12 @@ export namespace CppUtils::UnitTest::Thread::Scheduler
 			using TimePoint = CppUtils::Thread::Scheduler::TimePoint;
 			auto scheduler = CppUtils::Thread::Scheduler{};
 			auto times = std::vector<TimePoint>{};
+			auto mutex = std::mutex{};
 
-			auto record = [&](TimePoint timePoint) { times.push_back(timePoint); };
+			auto record = [&](TimePoint timePoint) {
+				auto lock = std::unique_lock{mutex};
+				times.push_back(timePoint);
+			};
 
 			scheduler.schedule([&] { record(Clock::now()); }, 100ms);
 			scheduler.schedule([&] { record(Clock::now()); }, 250ms);
@@ -141,8 +149,12 @@ export namespace CppUtils::UnitTest::Thread::Scheduler
 			using TimePoint = CppUtils::Thread::Scheduler::TimePoint;
 			auto scheduler = CppUtils::Thread::Scheduler{200ms};
 			auto times = std::vector<TimePoint>{};
+			auto mutex = std::mutex{};
 
-			auto record = [&](TimePoint timePoint) { times.push_back(timePoint); };
+			auto record = [&](TimePoint timePoint) {
+				auto lock = std::unique_lock{mutex};
+				times.push_back(timePoint);
+			};
 
 			scheduler.schedule([&] { record(Clock::now()); }, 100ms);
 			scheduler.schedule([&] { record(Clock::now()); }, 250ms);
@@ -159,7 +171,11 @@ export namespace CppUtils::UnitTest::Thread::Scheduler
 		suite.addTest("Schedule events in reverse order", [&] {
 			auto scheduler = CppUtils::Thread::Scheduler{};
 			auto executionOrder = std::vector<std::size_t>{};
-			auto record = [&](std::size_t value) { executionOrder.push_back(value); };
+			auto mutex = std::mutex{};
+			auto record = [&](std::size_t value) {
+				auto lock = std::unique_lock{mutex};
+				executionOrder.push_back(value);
+			};
 
 			scheduler.schedule([&] { record(2); }, 200ms);
 			scheduler.schedule([&] { record(1); }, 100ms);