Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 03:15:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15816 from roxanneskelly/bugz761

Browse source 
BUGZ-761 Add locks to OctreeEditPacketSender to protect various members
This commit is contained in:
Shannon Romano 2019-06-21 14:39:41 -07:00 committed by GitHub
commit 33c99da71e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/octree/src/OctreeEditPacketSender.cpp
View file

@ -46,6 +46,7 @@ bool OctreeEditPacketSender::serversExist() const {
void OctreeEditPacketSender::queuePacketToNode(const QUuid& nodeUUID, std::unique_ptr<NLPacket> packet) { void OctreeEditPacketSender::queuePacketToNode(const QUuid& nodeUUID, std::unique_ptr<NLPacket> packet) {
bool wantDebug = false; bool wantDebug = false;
QMutexLocker lock(&_packetsQueueLock);
DependencyManager::get<NodeList>()->eachNode([&](const SharedNodePointer& node){ DependencyManager::get<NodeList>()->eachNode([&](const SharedNodePointer& node){
// only send to the NodeTypes that are getMyNodeType() // only send to the NodeTypes that are getMyNodeType()
if (node->getType() == getMyNodeType() if (node->getType() == getMyNodeType()
@ -324,6 +325,8 @@ bool OctreeEditPacketSender::process() {
void OctreeEditPacketSender::processNackPacket(ReceivedMessage& message, SharedNodePointer sendingNode) { void OctreeEditPacketSender::processNackPacket(ReceivedMessage& message, SharedNodePointer sendingNode) {
// parse sending node from packet, retrieve packet history for that node // parse sending node from packet, retrieve packet history for that node
QMutexLocker lock(&_packetsQueueLock);
// if packet history doesn't exist for the sender node (somehow), bail // if packet history doesn't exist for the sender node (somehow), bail
if (_sentPacketHistories.count(sendingNode->getUUID()) == 0) { if (_sentPacketHistories.count(sendingNode->getUUID()) == 0) {
return; return;
@ -345,7 +348,7 @@ void OctreeEditPacketSender::processNackPacket(ReceivedMessage& message, SharedN
} }
void OctreeEditPacketSender::nodeKilled(SharedNodePointer node) { void OctreeEditPacketSender::nodeKilled(SharedNodePointer node) {
// TODO: add locks QMutexLocker lock(&_packetsQueueLock);
QUuid nodeUUID = node->getUUID(); QUuid nodeUUID = node->getUUID();
_pendingEditPackets.erase(nodeUUID); _pendingEditPackets.erase(nodeUUID);
_outgoingSequenceNumbers.erase(nodeUUID); _outgoingSequenceNumbers.erase(nodeUUID);

5
libraries/octree/src/OctreeEditPacketSender.h
View file

@ -86,19 +86,20 @@ protected:
void processPreServerExistsPackets(); void processPreServerExistsPackets();
// These are packets which are destined from know servers but haven't been released because they're still too small // These are packets which are destined from know servers but haven't been released because they're still too small
// protected by _packetsQueueLock
std::unordered_map<QUuid, PacketOrPacketList> _pendingEditPackets; std::unordered_map<QUuid, PacketOrPacketList> _pendingEditPackets;
// These are packets that are waiting to be processed because we don't yet know if there are servers // These are packets that are waiting to be processed because we don't yet know if there are servers
int _maxPendingMessages; int _maxPendingMessages;
bool _releaseQueuedMessagesPending; bool _releaseQueuedMessagesPending;
QMutex _pendingPacketsLock; QMutex _pendingPacketsLock;
QMutex _packetsQueueLock; // don't let different threads release the queue while another thread is writing to it QMutex _packetsQueueLock{ QMutex::Recursive }; // don't let different threads release the queue while another thread is writing to it
std::list<EditMessagePair> _preServerEdits; // these will get packed into other larger packets std::list<EditMessagePair> _preServerEdits; // these will get packed into other larger packets
std::list<std::unique_ptr<NLPacket>> _preServerSingleMessagePackets; // these will go out as is std::list<std::unique_ptr<NLPacket>> _preServerSingleMessagePackets; // these will go out as is
QMutex _releaseQueuedPacketMutex; QMutex _releaseQueuedPacketMutex;
// TODO: add locks for this and _pendingEditPackets // protected by _packetsQueueLock
std::unordered_map<QUuid, SentPacketHistory> _sentPacketHistories; std::unordered_map<QUuid, SentPacketHistory> _sentPacketHistories;
std::unordered_map<QUuid, quint16> _outgoingSequenceNumbers; std::unordered_map<QUuid, quint16> _outgoingSequenceNumbers;
}; };