fixed thread safe inject

Author: igorkorsukov

framework/global/thirdparty/kors_modularity/modularity/modulesioc.h

@@ -30,6 +30,7 @@ SOFTWARE.
 #include <cassert>
 #include <iostream>
 #include <functional>
+#include <mutex>
 
 #include "imoduleinterface.h"
 
@@ -138,15 +139,21 @@ class ModulesIoCBase
 
     void reset()
     {
-        for (auto& s : m_map) {
+        std::map<std::string_view, Service > copy;
+        {
+            std::lock_guard<std::mutex> lock(m_mutex);
+            copy = m_map;
+            m_map.clear();
+        }
+
+        for (auto& s : copy) {
             Service& inj = s.second;
             inj.p = nullptr;
 
             for (const auto& c : inj.onChanges) {
                 c.second(inj.p);
             }
         }
-        m_map.clear();
     }
 
     ModulesIoCBase() = default;
@@ -155,16 +162,20 @@ class ModulesIoCBase
 
     void unregisterService(const InterfaceInfo& info)
     {
-        auto it = m_map.find(info.id);
-        if (it == m_map.end()) {
-            return;
-        }
+        std::map<int, OnChangedInternal> onChanges;
+        {
+            std::lock_guard<std::mutex> lock(m_mutex);
+            auto it = m_map.find(info.id);
+            if (it == m_map.end()) {
+                return;
+            }
 
-        Service& inj = it->second;
-        inj.p = nullptr;
+            it->second.p = nullptr;
+            onChanges = it->second.onChanges;
+        }
 
-        for (const auto& c : inj.onChanges) {
-            c.second(inj.p);
+        for (const auto& c : onChanges) {
+            c.second(nullptr);
         }
     }
 
@@ -177,33 +188,39 @@ class ModulesIoCBase
             return;
         }
 
-        auto foundIt = m_map.find(info.id);
-        if (foundIt != m_map.end()) {
-            Service& inj = foundIt->second;
-            if (inj.p) {
-                std::cerr << module << ": double register:"
-                          << info.id << ", first register in" << m_map[info.id].sourceModule << std::endl;
-                assert(false);
+        std::map<int, OnChangedInternal> onChanges;
+        {
+            std::lock_guard<std::mutex> lock(m_mutex);
+            auto foundIt = m_map.find(info.id);
+            if (foundIt != m_map.end()) {
+                Service& inj = foundIt->second;
+                if (inj.p) {
+                    std::cerr << module << ": double register:"
+                              << info.id << ", first register in" << m_map[info.id].sourceModule << std::endl;
+                    assert(false);
+                } else {
+                    inj.sourceModule = module;
+                    inj.p = p;
+                    onChanges = inj.onChanges;
+                }
             } else {
+                Service inj;
                 inj.sourceModule = module;
                 inj.p = p;
-                for (const auto& c : inj.onChanges) {
-                    c.second(inj.p);
-                }
+                m_map[info.id] = inj;
             }
-        } else {
-            Service inj;
-            inj.sourceModule = module;
-            inj.p = p;
-            m_map[info.id] = inj;
+        }
+
+        for (const auto& c : onChanges) {
+            c.second(p);
         }
     }
 
     std::shared_ptr<IModuleInterface> doResolvePtrByInfo(const std::string_view& /*usageModule*/,
                                                          const InterfaceInfo& info)
     {
         //! TODO add statistics collection / monitoring, who resolves what
-
+        std::lock_guard<std::mutex> lock(m_mutex);
         auto it = m_map.find(info.id);
         if (it == m_map.end()) {
             return nullptr;
@@ -215,6 +232,7 @@ class ModulesIoCBase
     using OnChangedInternal = std::function<void (const std::shared_ptr<IModuleInterface>&)>;
     int doSubscribe(const InterfaceInfo& info, const OnChangedInternal& onChanged)
     {
+        std::lock_guard<std::mutex> lock(m_mutex);
         auto it = m_map.find(info.id);
         if (it == m_map.end()) {
             return -1;
@@ -229,6 +247,7 @@ class ModulesIoCBase
 
     void doUnsubscribe(const InterfaceInfo& info, int key)
     {
+        std::lock_guard<std::mutex> lock(m_mutex);
         auto it = m_map.find(info.id);
         if (it == m_map.end()) {
             return;
@@ -266,6 +285,7 @@ class ModulesIoCBase
         };
     }
 
+    std::mutex m_mutex;
     std::map<std::string_view, Service > m_map;
     std::shared_ptr<bool> m_alive = std::make_shared<bool>(true);
 };