Utility: LogManager Threadsafe

The LogManager is now threadsafe.

review id = 7

src/lib/utility/logging/LogManager.cpp

@@ -6,6 +6,7 @@
 
 std::shared_ptr<LogManager> LogManager::getInstance()
 {
+	std::lock_guard<std::mutex> lockGuard(s_instanceMutex);
 	if (s_instance.use_count() == 0)
 	{
 		s_instance = std::shared_ptr<LogManager>(new LogManager());
@@ -15,6 +16,7 @@ std::shared_ptr<LogManager> LogManager::getInstance()
 
 void LogManager::destroyInstance()
 {
+	std::lock_guard<std::mutex> lockGuard(s_instanceMutex);
 	s_instance.reset();
 }
 
@@ -24,11 +26,13 @@ LogManager::~LogManager()
 
 void LogManager::addLogger(std::shared_ptr<Logger> logger)
 {
+	std::lock_guard<std::mutex> lockGuard(m_loggerMutex);
 	m_loggers.push_back(logger);
 }
 
 void LogManager::removeLogger(std::shared_ptr<Logger> logger)
 {
+	std::lock_guard<std::mutex> lockGuard(m_loggerMutex);
 	std::vector<std::shared_ptr<Logger>>::iterator it = std::find(m_loggers.begin(), m_loggers.end(), logger);
 	if (it != m_loggers.end())
 	{
@@ -38,9 +42,10 @@ void LogManager::removeLogger(std::shared_ptr<Logger> logger)
 
 void LogManager::removeLoggersByType(const std::string& type)
 {
+	std::lock_guard<std::mutex> lockGuard(m_loggerMutex);
 	for (int i = 0; i < m_loggers.size(); i++)
 	{
-		if (m_loggers[i]->getType().c_str() == type.c_str())
+		if (m_loggers[i]->getType() == type)
 		{
 			m_loggers.erase(m_loggers.begin() + i);
 			i--;
@@ -50,6 +55,7 @@ void LogManager::removeLoggersByType(const std::string& type)
 
 int LogManager::getLoggerCount() const
 {
+	std::lock_guard<std::mutex> lockGuard(m_loggerMutex);
 	return m_loggers.size();
 }
 
@@ -60,6 +66,7 @@ void LogManager::logInfo(
 	const unsigned int line
 )
 {
+	std::lock_guard<std::mutex> lockGuardLogger(m_loggerMutex);
 	for (int i = 0; i < m_loggers.size(); i++)
 	{
 		m_loggers[i]->logInfo(LogMessage(message, file, function, line, getTime()));
@@ -73,6 +80,7 @@ void LogManager::logWarning(
 	const unsigned int line
 )
 {
+	std::lock_guard<std::mutex> lockGuardLogger(m_loggerMutex);
 	for (int i = 0; i < m_loggers.size(); i++)
 	{
 		m_loggers[i]->logWarning(LogMessage(message, file, function, line, getTime()));
@@ -86,6 +94,7 @@ void LogManager::logError(
 	const unsigned int line
 )
 {
+	std::lock_guard<std::mutex> lockGuardLogger(m_loggerMutex);
 	for (int i = 0; i < m_loggers.size(); i++)
 	{
 		m_loggers[i]->logError(LogMessage(message, file, function, line, getTime()));
@@ -93,6 +102,7 @@ void LogManager::logError(
 }
 
 std::shared_ptr<LogManager> LogManager::s_instance;
+std::mutex LogManager::s_instanceMutex;
 
 LogManager::LogManager()
 {

src/lib/utility/logging/LogManager.h

@@ -2,6 +2,7 @@
 #define LOG_MANAGER_H
 
 #include <memory>
+#include <mutex>
 #include <vector>
 
 #include "utility/logging/Logger.h"
@@ -40,6 +41,7 @@ public:
 
 private:
 	static std::shared_ptr<LogManager> s_instance;
+	static std::mutex s_instanceMutex;
 
 	LogManager();
 	LogManager(const LogManager&);
@@ -48,6 +50,8 @@ private:
 	tm getTime();
 
 	std::vector<std::shared_ptr<Logger> > m_loggers;
+
+	mutable std::mutex m_loggerMutex;
 };
 
 #endif // LOG_MANAGER_H

src/test/LogManagerTestSuite.h

@@ -1,5 +1,7 @@
 #include "cxxtest/TestSuite.h"
 
+#include <thread>
+
 #include "utility/logging/logging.h"
 
 class LogManagerTestSuite : public CxxTest::TestSuite
@@ -80,7 +82,79 @@ public:
 		TS_ASSERT_EQUALS(log, lastLog);
 	}
 
+	void test_new_logger_can_be_added_to_manager_threaded()
+	{
+		std::thread thread0(addTestLogger);
+		std::thread thread1(addTestLogger);
+
+		thread0.join();
+		thread1.join();
+
+		TS_ASSERT_EQUALS(200, LogManager::getInstance()->getLoggerCount());
+
+		removeTestLoggers();
+	}
+
+	void test_logger_can_be_removed_from_manager_threaded()
+	{
+		std::thread thread0(addAndRemoveTestLogger);
+		std::thread thread1(addAndRemoveTestLogger);
+
+		thread0.join();
+		thread1.join();
+
+		TS_ASSERT_EQUALS(0, LogManager::getInstance()->getLoggerCount());
+	}
+
+	void test_logger_logs_threaded()
+	{
+		std::shared_ptr<TestLogger> logger = std::make_shared<TestLogger>();
+		LogManager::getInstance()->addLogger(logger);
+
+		std::thread thread0(loggSomeMessages);
+		std::thread thread1(loggSomeMessages);
+
+		thread0.join();
+		thread1.join();
+
+		TS_ASSERT_EQUALS(logger->getLastError(), "foo");
+		TS_ASSERT_EQUALS(600, logger->getErrorCount() + logger->getWarningCount() + logger->getMessageCount());
+
+		removeTestLoggers();
+	}
+
 private:
+	static void addTestLogger()
+	{
+		for(unsigned int i = 0; i < 100; i++)
+		{
+			std::shared_ptr<Logger> logger = std::make_shared<TestLogger>();
+			LogManager::getInstance()->addLogger(logger);
+		}
+	}
+
+	static void removeTestLoggers()
+	{
+		std::shared_ptr<Logger> logger = std::make_shared<TestLogger>();
+		LogManager::getInstance()->removeLoggersByType(logger->getType());
+	}
+
+	static void addAndRemoveTestLogger()
+	{
+		addTestLogger();
+		removeTestLoggers();
+	}
+
+	static void loggSomeMessages()
+	{
+		for(unsigned int i = 0; i < 100; i++)
+		{
+			LOG_INFO("foo");
+			LOG_WARNING("foo");
+			LOG_ERROR("foo");
+		}
+	}
+
 	class TestLogger: public Logger
 	{
 	public: