Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix deadlock in silent node removal

Browse source
This commit is contained in:
Stephen Birarda 2014-01-13 17:33:58 -08:00
parent 6a0c431562
commit 0579b18426
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/shared/src/NodeList.cpp
View file

@ -794,17 +794,19 @@ void NodeList::removeSilentNodes() {
NodeHash::iterator nodeItem = _nodeHash.begin(); NodeHash::iterator nodeItem = _nodeHash.begin();
while (nodeItem != _nodeHash.end()) { while (nodeItem != _nodeHash.end()) {
nodeItem.value()->lock();
if ((usecTimestampNow() - nodeItem.value()->getLastHeardMicrostamp()) > NODE_SILENCE_THRESHOLD_USECS) { SharedNodePointer node = nodeItem.value();
SharedNodePointer node = nodeItem.value();
node->lock();
if ((usecTimestampNow() - node->getLastHeardMicrostamp()) > NODE_SILENCE_THRESHOLD_USECS) {
// kill this node, don't lock - we already did it // kill this node, don't lock - we already did it
_nodeHash.erase(nodeItem); _nodeHash.erase(nodeItem);
// unlock the node
node->unlock();
} }
// unlock the node
node->unlock();
} }
} }