diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-26 12:17:43 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-26 12:17:43 -0700 |
| commit | e8ab6adf8902dce98b4721e2f4a5382e54bcbcbc (patch) | |
| tree | 83265f860d94999bbb7d4eb765b779d8a7ab75e5 /controller/JSONDB.hpp | |
| parent | 7c184cf9919fb9d01b8279397e7b20fa756dc981 (diff) | |
| download | infinitytier-e8ab6adf8902dce98b4721e2f4a5382e54bcbcbc.tar.gz infinitytier-e8ab6adf8902dce98b4721e2f4a5382e54bcbcbc.zip | |
Deadlock fix.
Diffstat (limited to 'controller/JSONDB.hpp')
| -rw-r--r-- | controller/JSONDB.hpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/controller/JSONDB.hpp b/controller/JSONDB.hpp index 55ead4ea..f89ff6c9 100644 --- a/controller/JSONDB.hpp +++ b/controller/JSONDB.hpp @@ -82,19 +82,12 @@ public: 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)); - if (i == _networks.end()) - return false; - 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 - } + Mutex::Lock _l(_networks_m); + std::unordered_map<uint64_t,_NW>::const_iterator i(_networks.find(networkId)); + if (i == _networks.end()) + return false; + ns = i->second.summaryInfo; + return true; } /** |