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

rename nodesToKill to nodesToShutdown

Browse source
This commit is contained in:
Stephen Birarda 2015-07-22 13:55:22 -07:00
parent d22219a1f2
commit 67294d3a23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1176,18 +1176,18 @@ void OctreeServer::aboutToFinish() {
_jurisdictionSender->terminating(); _jurisdictionSender->terminating();
} }
QSet<SharedNodePointer> nodesToKill; QSet<SharedNodePointer> nodesToShutdown;
// Force a shutdown of all of our OctreeSendThreads. // Force a shutdown of all of our OctreeSendThreads.
// At this point it has to be impossible for a linkedDataCreateCallback to be called for a new node // At this point it has to be impossible for a linkedDataCreateCallback to be called for a new node
nodeList->eachNode([&nodesToKill](const SharedNodePointer& node) { nodeList->eachNode([&nodesToShutdown](const SharedNodePointer& node) {
nodesToKill << node; nodesToShutdown << node;
}); });
// What follows is a hack to force OctreeSendThreads to cleanup before the OctreeServer is gone. // What follows is a hack to force OctreeSendThreads to cleanup before the OctreeServer is gone.
// I would prefer to allow the SharedNodePointer ref count drop to zero to do this automatically // I would prefer to allow the SharedNodePointer ref count drop to zero to do this automatically
// but that isn't possible as long as the OctreeSendThread has an OctreeServer* that it uses. // but that isn't possible as long as the OctreeSendThread has an OctreeServer* that it uses.
for (auto& node : nodesToKill) { for (auto& node : nodesToShutdown) {
qDebug() << qPrintable(_safeServerName) << "server about to finish while node still connected node:" << *node; qDebug() << qPrintable(_safeServerName) << "server about to finish while node still connected node:" << *node;
forceNodeShutdown(node); forceNodeShutdown(node);
} }