Skip to content

fixed thread safe inject #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
igorkorsukov wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −26
Open

fixed thread safe inject #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 46 additions & 26 deletions framework/global/thirdparty/kors_modularity/modularity/modulesioc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ SOFTWARE.
#include <cassert>
#include <iostream>
#include <functional>
#include <mutex>

#include "imoduleinterface.h"

Expand Down Expand Up @@ -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;
Expand All @@ -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);
}
}

Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
};
Expand Down