Thread: MultipleAccessor

Author: MorganCaron

modules/Thread/SharedLocker.mpp

@@ -58,6 +58,9 @@ export namespace CppUtils::Thread
 	private:
 		mutable std::shared_mutex m_mutex;
 		T m_value;
+
+		template<class... Lockers>
+		friend struct MultipleAccessor;
 	};
 
 	template<class T>

modules/Thread/UniqueLocker.mpp

@@ -91,8 +91,26 @@ export namespace CppUtils::Thread
 	private:
 		mutable std::mutex m_mutex;
 		T m_value;
+
+		template<class... Lockers>
+		friend struct MultipleAccessor;
 	};
 
 	template<class T>
 	UniqueLocker(T) -> UniqueLocker<T>;
+
+	template<class... Lockers>
+	struct MultipleAccessor final
+	{
+		MultipleAccessor(Lockers&... lockers):
+			m_lockGuard{lockers.m_mutex...},
+			values{std::tie(lockers.m_value...)}
+		{}
+
+	private:
+		std::scoped_lock<decltype(std::declval<Lockers>().m_mutex)...> m_lockGuard;
+
+	public:
+		std::tuple<decltype(std::declval<Lockers>().m_value)&...> values;
+	};
 }

tests/Thread/SharedLocker.mpp

@@ -43,5 +43,25 @@ export namespace CppUtils::UnitTest::Thread::SharedLocker
 				suite.expect(accessor1.value() == "Foo");
 			}
 		});
+
+		suite.addTest("MultipleAccessor", [&] {
+			auto lockedString1 = CppUtils::Thread::SharedLocker<std::string>{"Foo"};
+			auto lockedString2 = CppUtils::Thread::SharedLocker<std::string>{"Bar"};
+			{
+				auto accessor = CppUtils::Thread::MultipleAccessor{lockedString1, lockedString2};
+				suite.expect(std::get<0>(accessor.values) == "Foo");
+				suite.expect(std::get<1>(accessor.values) == "Bar");
+			}
+		});
+
+		suite.addTest("Mixed access", [&] {
+			auto lockedString1 = CppUtils::Thread::UniqueLocker<std::string>{"Foo"};
+			auto lockedString2 = CppUtils::Thread::SharedLocker<std::string>{"Bar"};
+			{
+				auto accessor = CppUtils::Thread::MultipleAccessor{lockedString1, lockedString2};
+				suite.expect(std::get<0>(accessor.values) == "Foo");
+				suite.expect(std::get<1>(accessor.values) == "Bar");
+			}
+		});
 	}};
 }

tests/Thread/UniqueLocker.mpp

@@ -49,5 +49,15 @@ export namespace CppUtils::UnitTest::Thread::UniqueLocker
 			auto accessor = constLockedString.access();
 			suite.expect(accessor.value() == "Test");
 		});
+
+		suite.addTest("MultipleAccessor", [&] {
+			auto lockedString1 = CppUtils::Thread::UniqueLocker<std::string>{"Foo"};
+			auto lockedString2 = CppUtils::Thread::UniqueLocker<std::string>{"Bar"};
+			{
+				auto accessor = CppUtils::Thread::MultipleAccessor{lockedString1, lockedString2};
+				suite.expect(std::get<0>(accessor.values) == "Foo");
+				suite.expect(std::get<1>(accessor.values) == "Bar");
+			}
+		});
 	}};
 }