Merge pull request #13 from salesforce/guard-thread-exceptions

salesforce · Mar 1, 2022 · cc06936 · cc06936
2 parents 583171b + b647f01
commit cc06936
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/p4-fusion/thread_pool.cc b/p4-fusion/thread_pool.cc
@@ -42,6 +42,8 @@ void ThreadPool::Wait()
 
 void ThreadPool::RaiseCaughtExceptions()
 {
+	std::unique_lock<std::mutex> lock(m_ThreadExceptionsMutex);
+
 	for (auto& exceptionPtr : m_ThreadExceptions)
 	{
 		if (exceptionPtr)
@@ -123,6 +125,8 @@ void ThreadPool::Initialize(int size)
 				}
 				catch (const std::exception& e)
 				{
+					std::unique_lock<std::mutex> lock(m_ThreadExceptionsMutex);
+
 					m_ThreadExceptions[i] = std::current_exception();
 				}
 				m_JobsProcessing--;

diff --git a/p4-fusion/thread_pool.h b/p4-fusion/thread_pool.h
@@ -21,6 +21,7 @@ class ThreadPool
 	typedef std::function<void(P4API*)> Job;
 
 	std::vector<std::thread> m_Threads;
+	std::mutex m_ThreadExceptionsMutex;
 	std::vector<std::exception_ptr> m_ThreadExceptions;
 	std::vector<std::string> m_ThreadNames;
 	std::vector<P4API> m_P4Contexts;