BUG: Use atomic bool to fix race found by thread sanitizer

Kitware · Sep 21, 2023 · c3a8eab · c3a8eab
1 parent 04100e6
commit c3a8eab
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/Modules/Core/Common/src/itkObjectFactoryBase.cxx b/Modules/Core/Common/src/itkObjectFactoryBase.cxx
@@ -37,6 +37,7 @@
 #include "itksys/SystemTools.hxx"
 #include <cstring>
 #include <algorithm>
+#include <atomic>
 
 namespace
 {
@@ -120,10 +121,10 @@ class ObjectFactoryBase::ObjectFactoryBasePrivate : public LightObject
 
   ObjectFactoryBasePrivate() = default;
 
-  FactoryListType m_RegisteredFactories{};
-  FactoryListType m_InternalFactories{};
-  bool            m_Initialized{ false };
-  bool            m_StrictVersionChecking{ false };
+  FactoryListType   m_RegisteredFactories{};
+  FactoryListType   m_InternalFactories{};
+  std::atomic<bool> m_Initialized{ false };
+  bool              m_StrictVersionChecking{ false };
 };
 
 auto
@@ -236,9 +237,9 @@ ObjectFactoryBase::Initialize()
 {
   itkInitGlobalsMacro(PimplGlobals);
 
-  if (!m_PimplGlobals->m_Initialized)
+  // Atomically set m_Initialized to true. If it was false before, enter the if.
+  if (!m_PimplGlobals->m_Initialized.exchange(true))
   {
-    m_PimplGlobals->m_Initialized = true;
     ObjectFactoryBase::InitializeFactoryList();
     ObjectFactoryBase::RegisterInternal();
 #if defined(ITK_DYNAMIC_LOADING) && !defined(ITK_WRAPPING)