Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix node flapping race

Browse source
This commit is contained in:
Atlante45 2015-12-16 14:24:52 -08:00
parent 6bda8d3f18
commit b709c8162c
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
assignment-client/src/octree/OctreeServer.cpp
View file

@ -879,10 +879,11 @@ OctreeServer::UniqueSendThread OctreeServer::createSendThread(const SharedNodePo
} }
void OctreeServer::removeSendThread() { void OctreeServer::removeSendThread() {
auto sendThread = static_cast<OctreeSendThread*>(sender()); // If the object has been deleted since the event was queued, sender() will return nullptr
if (auto sendThread = qobject_cast<OctreeSendThread*>(sender())) {
// This deletes the unique_ptr, so sendThread is destructed after that line // This deletes the unique_ptr, so sendThread is destructed after that line
_sendThreads.erase(sendThread->getNodeUuid()); _sendThreads.erase(sendThread->getNodeUuid());
}
} }
void OctreeServer::handleOctreeQueryPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) { void OctreeServer::handleOctreeQueryPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
@ -893,7 +894,13 @@ void OctreeServer::handleOctreeQueryPacket(QSharedPointer<ReceivedMessage> messa
nodeList->updateNodeWithDataFromPacket(message, senderNode); nodeList->updateNodeWithDataFromPacket(message, senderNode);
auto it = _sendThreads.find(senderNode->getUUID()); auto it = _sendThreads.find(senderNode->getUUID());
if (it == _sendThreads.end() || it->second->isShuttingDown()) { if (it == _sendThreads.end()) {
_sendThreads.emplace(senderNode->getUUID(), createSendThread(senderNode));
} else if (it->second->isShuttingDown()) {
auto& sendThread = *it->second;
sendThread.setIsShuttingDown();
_sendThreads.erase(it); // Remove right away and wait on thread to be
_sendThreads.emplace(senderNode->getUUID(), createSendThread(senderNode)); _sendThreads.emplace(senderNode->getUUID(), createSendThread(senderNode));
} }
} }
@ -1224,7 +1231,6 @@ void OctreeServer::aboutToFinish() {
// Shut down all the send threads // Shut down all the send threads
for (auto& it : _sendThreads) { for (auto& it : _sendThreads) {
auto& sendThread = *it.second; auto& sendThread = *it.second;
sendThread.disconnect(this); // Disconnect so that removeSendThread doesn't get called later
sendThread.setIsShuttingDown(); sendThread.setIsShuttingDown();
} }