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

LocalID - Use tbb hash map instead of std one for better concurrency

Browse source
This commit is contained in:
Simon Walton 2018-04-02 10:46:38 -07:00
parent f4bd1f5ed7
commit 2ba64e1115
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/networking/src/LimitedNodeList.cpp
View file

@ -696,7 +696,7 @@ SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t
auto oldSoloNode = previousSoloIt->second; auto oldSoloNode = previousSoloIt->second;
_localIDMap.erase(oldSoloNode->getLocalID()); _localIDMap.unsafe_erase(oldSoloNode->getLocalID());
_nodeHash.unsafe_erase(previousSoloIt); _nodeHash.unsafe_erase(previousSoloIt);
handleNodeKill(oldSoloNode); handleNodeKill(oldSoloNode);
@ -840,6 +840,7 @@ void LimitedNodeList::removeSilentNodes() {
if (!node->isForcedNeverSilent() if (!node->isForcedNeverSilent()
&& (usecTimestampNow() - node->getLastHeardMicrostamp()) > (NODE_SILENCE_THRESHOLD_MSECS * USECS_PER_MSEC)) { && (usecTimestampNow() - node->getLastHeardMicrostamp()) > (NODE_SILENCE_THRESHOLD_MSECS * USECS_PER_MSEC)) {
// call the NodeHash erase to get rid of this node // call the NodeHash erase to get rid of this node
_localIDMap.unsafe_erase(node->getLocalID());
it = _nodeHash.unsafe_erase(it); it = _nodeHash.unsafe_erase(it);
killedNodes.insert(node); killedNodes.insert(node);
@ -852,10 +853,6 @@ void LimitedNodeList::removeSilentNodes() {
}); });
foreach(const SharedNodePointer& killedNode, killedNodes) { foreach(const SharedNodePointer& killedNode, killedNodes) {
{
QWriteLocker writeLock { &_nodeMutex };
_localIDMap.erase(killedNode->getLocalID());
}
handleNodeKill(killedNode); handleNodeKill(killedNode);
} }
} }

2
libraries/networking/src/LimitedNodeList.h
View file

@ -431,7 +431,7 @@ private slots:
private: private:
mutable QReadWriteLock _sessionUUIDLock; mutable QReadWriteLock _sessionUUIDLock;
QUuid _sessionUUID; QUuid _sessionUUID;
using LocalIDMapping = std::unordered_map<Node::LocalID, SharedNodePointer>; using LocalIDMapping = tbb::concurrent_unordered_map<Node::LocalID, SharedNodePointer>;
LocalIDMapping _localIDMap; LocalIDMapping _localIDMap;
Node::LocalID _sessionLocalID { 0 }; Node::LocalID _sessionLocalID { 0 };
}; };