ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-01 23:10:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deadlock fix.

Browse Source
This commit is contained in:
Adam Ierymenko 2017-04-26 12:17:43 -07:00
parent 7c184cf991
commit e8ab6adf89
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
controller/JSONDB.cpp
View File

@ -60,6 +60,15 @@ JSONDB::JSONDB(const std::string &basePath) :
for(std::unordered_map<uint64_t,_NW>::iterator n(_networks.begin());n!=_networks.end();++n) for(std::unordered_map<uint64_t,_NW>::iterator n(_networks.begin());n!=_networks.end();++n)
_recomputeSummaryInfo(n->first); _recomputeSummaryInfo(n->first);
for(;;) {
_summaryThread_m.lock();
if (_summaryThreadToDo.empty()) {
_summaryThread_m.unlock();
break;
}
_summaryThread_m.unlock();
Thread::sleep(50);
}
} }
JSONDB::~JSONDB() JSONDB::~JSONDB()
@ -107,7 +116,7 @@ void JSONDB::saveNetwork(const uint64_t networkId,const nlohmann::json &networkC
Mutex::Lock _l(_networks_m); Mutex::Lock _l(_networks_m);
_networks[networkId].config = networkConfig; _networks[networkId].config = networkConfig;
} }
//_recomputeSummaryInfo(networkId); _recomputeSummaryInfo(networkId);
} }
void JSONDB::saveNetworkMember(const uint64_t networkId,const uint64_t nodeId,const nlohmann::json &memberConfig) void JSONDB::saveNetworkMember(const uint64_t networkId,const uint64_t nodeId,const nlohmann::json &memberConfig)

19
controller/JSONDB.hpp
View File

@ -82,19 +82,12 @@ public:
inline bool getNetworkSummaryInfo(const uint64_t networkId,NetworkSummaryInfo &ns) const inline bool getNetworkSummaryInfo(const uint64_t networkId,NetworkSummaryInfo &ns) const
{ {
for(;;) { Mutex::Lock _l(_networks_m);
{ std::unordered_map<uint64_t,_NW>::const_iterator i(_networks.find(networkId));
Mutex::Lock _l(_networks_m); if (i == _networks.end())
std::unordered_map<uint64_t,_NW>::const_iterator i(_networks.find(networkId)); return false;
if (i == _networks.end()) ns = i->second.summaryInfo;
return false; return true;
if (i->second.summaryInfoLastComputed) {
ns = i->second.summaryInfo;
return true;
}
}
Thread::sleep(100); // wait for this to be done the first time, which happens when we start
}
} }
/** /**