NOT MERGEABLE: graceful cleanup on Application dtor for NodeList
Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -146,7 +146,6 @@ const qint64 MAXIMUM_CACHE_SIZE = 10 * BYTES_PER_GIGABYTES; // 10GB · 145 unmodified lines | ||
| 146 | 146 | |
| 147 | 147 | static QTimer* locationUpdateTimer = NULL; |
| 148 | 148 | static QTimer* balanceUpdateTimer = NULL; |
| 149 | −static QTimer* silentNodeTimer = NULL; | |
| 150 | 149 | static QTimer* identityPacketTimer = NULL; |
| 151 | 150 | static QTimer* billboardPacketTimer = NULL; |
| 152 | 151 | static QTimer* checkFPStimer = NULL; |
| @@ -258,7 +257,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 105 unmodified lines | ||
| 258 | 257 | _dependencyManagerIsSetup(setupEssentials(argc, argv)), |
| 259 | 258 | _window(new MainWindow(desktop())), |
| 260 | 259 | _toolWindow(NULL), |
| 261 | − _nodeThread(new QThread(this)), | |
| 262 | 260 | _datagramProcessor(), |
| 263 | 261 | _undoStack(), |
| 264 | 262 | _undoStackScriptingInterface(&_undoStack), |
| @@ -329,18 +327,20 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 64 unmodified lines | ||
| 329 | 327 | _runningScriptsWidget = new RunningScriptsWidget(_window); |
| 330 | 328 | |
| 331 | 329 | // start the nodeThread so its event loop is running |
| 332 | − _nodeThread->setObjectName("Datagram Processor Thread"); | |
| 333 | − _nodeThread->start(); | |
| 330 | + QThread* nodeThread = new QThread(this); | |
| 331 | + nodeThread->setObjectName("Datagram Processor Thread"); | |
| 332 | + nodeThread->start(); | |
| 334 | 333 | |
| 335 | 334 | // make sure the node thread is given highest priority |
| 336 | − _nodeThread->setPriority(QThread::TimeCriticalPriority); | |
| 335 | + nodeThread->setPriority(QThread::TimeCriticalPriority); | |
| 336 | + | |
| 337 | + _datagramProcessor = new DatagramProcessor(nodeList.data()); | |
| 337 | 338 | |
| 338 | 339 | // put the NodeList and datagram processing on the node thread |
| 339 | − nodeList->moveToThread(_nodeThread); | |
| 340 | − _datagramProcessor.moveToThread(_nodeThread); | |
| 340 | + nodeList->moveToThread(nodeThread); | |
| 341 | 341 | |
| 342 | 342 | // connect the DataProcessor processDatagrams slot to the QUDPSocket readyRead() signal |
| 343 | − connect(&nodeList->getNodeSocket(), SIGNAL(readyRead()), &_datagramProcessor, SLOT(processDatagrams())); | |
| 343 | + connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead, _datagramProcessor, &DatagramProcessor::processDatagrams); | |
| 344 | 344 | |
| 345 | 345 | // put the audio processing on a separate thread |
| 346 | 346 | QThread* audioThread = new QThread(); |
| @@ -427,12 +427,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 80 unmodified lines | ||
| 427 | 427 | // connect to the packet sent signal of the _entityEditSender |
| 428 | 428 | connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent); |
| 429 | 429 | |
| 430 | − // move the silentNodeTimer to the _nodeThread | |
| 431 | − silentNodeTimer = new QTimer(); | |
| 432 | − connect(silentNodeTimer, SIGNAL(timeout()), nodeList.data(), SLOT(removeSilentNodes())); | |
| 433 | − silentNodeTimer->start(NODE_SILENCE_THRESHOLD_MSECS); | |
| 434 | − silentNodeTimer->moveToThread(_nodeThread); | |
| 435 | − | |
| 436 | 430 | // send the identity packet for our avatar each second to our avatar mixer |
| 437 | 431 | identityPacketTimer = new QTimer(); |
| 438 | 432 | connect(identityPacketTimer, &QTimer::timeout, _myAvatar, &MyAvatar::sendIdentityPacket); |
| @@ -547,7 +541,7 @@ void Application::aboutToQuit() { · 108 unmodified lines | ||
| 547 | 541 | } |
| 548 | 542 | |
| 549 | 543 | void Application::cleanupBeforeQuit() { |
| 550 | − _datagramProcessor.shutdown(); // tell the datagram processor we're shutting down, so it can short circuit | |
| 544 | + _datagramProcessor->shutdown(); // tell the datagram processor we're shutting down, so it can short circuit | |
| 551 | 545 | _entities.shutdown(); // tell the entities system we're shutting down, so it will stop running scripts |
| 552 | 546 | ScriptEngine::stopAllScripts(this); // stop all currently running global scripts |
| 553 | 547 | |
| @@ -555,7 +549,6 @@ void Application::cleanupBeforeQuit() { · 1 unmodified line | ||
| 555 | 549 | // depending on what thread they run in |
| 556 | 550 | locationUpdateTimer->stop(); |
| 557 | 551 | balanceUpdateTimer->stop(); |
| 558 | − QMetaObject::invokeMethod(silentNodeTimer, "stop", Qt::BlockingQueuedConnection); | |
| 559 | 552 | identityPacketTimer->stop(); |
| 560 | 553 | billboardPacketTimer->stop(); |
| 561 | 554 | checkFPStimer->stop(); |
| @@ -565,7 +558,6 @@ void Application::cleanupBeforeQuit() { · 3 unmodified lines | ||
| 565 | 558 | // and then delete those that got created by "new" |
| 566 | 559 | delete locationUpdateTimer; |
| 567 | 560 | delete balanceUpdateTimer; |
| 568 | − delete silentNodeTimer; | |
| 569 | 561 | delete identityPacketTimer; |
| 570 | 562 | delete billboardPacketTimer; |
| 571 | 563 | delete checkFPStimer; |
| @@ -597,10 +589,6 @@ Application::~Application() { · 25 unmodified lines | ||
| 597 | 589 | tree->lockForWrite(); |
| 598 | 590 | _entities.getTree()->setSimulation(NULL); |
| 599 | 591 | tree->unlock(); |
| 600 | − | |
| 601 | − // ask the datagram processing thread to quit and wait until it is done | |
| 602 | − _nodeThread->quit(); | |
| 603 | − _nodeThread->wait(); | |
| 604 | 592 | |
| 605 | 593 | _octreeProcessor.terminate(); |
| 606 | 594 | _entityEditSender.terminate(); |
| @@ -620,6 +608,14 @@ Application::~Application() { · 13 unmodified lines | ||
| 620 | 608 | DependencyManager::destroy<GeometryCache>(); |
| 621 | 609 | //DependencyManager::destroy<ScriptCache>(); |
| 622 | 610 | DependencyManager::destroy<SoundCache>(); |
| 611 | + | |
| 612 | + auto nodeList = DependencyManager::get<NodeList>(); | |
| 613 | + QThread* nodeThread = nodeList->thread(); | |
| 614 | + nodeList->deleteLater(); | |
| 615 | + | |
| 616 | + // ask the node thread to quit and wait until it is done | |
| 617 | + nodeThread->quit(); | |
| 618 | + nodeThread->wait(); | |
| 623 | 619 | |
| 624 | 620 | qInstallMessageHandler(NULL); // NOTE: Do this as late as possible so we continue to get our log messages |
| 625 | 621 | } |
| @@ -1498,7 +1494,7 @@ void Application::checkFPS() { · 872 unmodified lines | ||
| 1498 | 1494 | |
| 1499 | 1495 | _fps = (float)_frameCount / diffTime; |
| 1500 | 1496 | _frameCount = 0; |
| 1501 | − _datagramProcessor.resetCounters(); | |
| 1497 | + _datagramProcessor->resetCounters(); | |
| 1502 | 1498 | _timerStart.start(); |
| 1503 | 1499 | |
| 1504 | 1500 | // ask the node list to check in with the domain server |