Skip to content
Snippets Groups Projects
Commit d6d73658 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Remove waitConnections lock

parent a10ec3d2
No related branches found
No related tags found
No related merge requests found
...@@ -278,7 +278,9 @@ void Universe::unbind(const std::string &name) { ...@@ -278,7 +278,9 @@ void Universe::unbind(const std::string &name) {
int Universe::waitConnections() { int Universe::waitConnections() {
SHARED_LOCK(net_mutex_, lk); SHARED_LOCK(net_mutex_, lk);
return std::count_if(peers_.begin(), peers_.end(), [](const auto &p) { auto peers = peers_;
lk.unlock();
return std::count_if(peers.begin(), peers.end(), [](const auto &p) {
return p && p->waitConnection(); return p && p->waitConnection();
}); });
} }
...@@ -636,7 +638,7 @@ void Universe::_notifyError(Peer *p, ftl::protocol::Error e, const std::string & ...@@ -636,7 +638,7 @@ void Universe::_notifyError(Peer *p, ftl::protocol::Error e, const std::string &
const auto ptr = (p) ? _findPeer(p) : nullptr; const auto ptr = (p) ? _findPeer(p) : nullptr;
// Note: Net errors can have no peer // Note: Net errors can have no peer
if (!ptr) return; //if (!ptr) return;
on_error_.triggerAsync(ptr, e, errstr); on_error_.triggerAsync(ptr, e, errstr);
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment