Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList""

This reverts commit 9269b2a0b2ae9d05abf721f32b3f3f91ad844b16.

Stephen Birarda committed 11 years ago

Commit 7bfc7471 parent 278813e6 files · +27 −34Browse files

Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all

Unified · Split

 static QTimer* locationUpdateTimer = NULL;
 static QTimer* balanceUpdateTimer = NULL;
-static QTimer* silentNodeTimer = NULL;
 static QTimer* identityPacketTimer = NULL;
 static QTimer* billboardPacketTimer = NULL;
 static QTimer* checkFPStimer = NULL;
         _dependencyManagerIsSetup(setupEssentials(argc, argv)),
         _window(new MainWindow(desktop())),
         _toolWindow(NULL),
-        _nodeThread(new QThread(this)),
         _datagramProcessor(),
         _undoStack(),
         _undoStackScriptingInterface(&_undoStack),
     _runningScriptsWidget = new RunningScriptsWidget(_window);
     // start the nodeThread so its event loop is running
-    _nodeThread->setObjectName("Datagram Processor Thread");
+    QThread* nodeThread = new QThread(this);
-    _nodeThread->start();
+    nodeThread->setObjectName("Datagram Processor Thread");
+    nodeThread->start();
     // make sure the node thread is given highest priority
-    _nodeThread->setPriority(QThread::TimeCriticalPriority);
+    nodeThread->setPriority(QThread::TimeCriticalPriority);
+    _datagramProcessor = new DatagramProcessor(nodeList.data());
     // put the NodeList and datagram processing on the node thread
-    nodeList->moveToThread(_nodeThread);
+    nodeList->moveToThread(nodeThread);
-    _datagramProcessor.moveToThread(_nodeThread);
     // connect the DataProcessor processDatagrams slot to the QUDPSocket readyRead() signal
-    connect(&nodeList->getNodeSocket(), SIGNAL(readyRead()), &_datagramProcessor, SLOT(processDatagrams()));
+    connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead, _datagramProcessor, &DatagramProcessor::processDatagrams);
     // put the audio processing on a separate thread
     QThread* audioThread = new QThread();
     // connect to the packet sent signal of the _entityEditSender
     connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent);
-    // move the silentNodeTimer to the _nodeThread
-    silentNodeTimer = new QTimer();
-    connect(silentNodeTimer, SIGNAL(timeout()), nodeList.data(), SLOT(removeSilentNodes()));
-    silentNodeTimer->start(NODE_SILENCE_THRESHOLD_MSECS);
-    silentNodeTimer->moveToThread(_nodeThread);
     // send the identity packet for our avatar each second to our avatar mixer
     identityPacketTimer = new QTimer();
     connect(identityPacketTimer, &QTimer::timeout, _myAvatar, &MyAvatar::sendIdentityPacket);
 }
 void Application::cleanupBeforeQuit() {
-    _datagramProcessor.shutdown(); // tell the datagram processor we're shutting down, so it can short circuit
+    _datagramProcessor->shutdown(); // tell the datagram processor we're shutting down, so it can short circuit
     _entities.shutdown(); // tell the entities system we're shutting down, so it will stop running scripts
     ScriptEngine::stopAllScripts(this); // stop all currently running global scripts
     // depending on what thread they run in
     locationUpdateTimer->stop();
     balanceUpdateTimer->stop();
-    QMetaObject::invokeMethod(silentNodeTimer, "stop", Qt::BlockingQueuedConnection);
     identityPacketTimer->stop();
     billboardPacketTimer->stop();
     checkFPStimer->stop();
     // and then delete those that got created by "new"
     delete locationUpdateTimer;
     delete balanceUpdateTimer;
-    delete silentNodeTimer;
     delete identityPacketTimer;
     delete billboardPacketTimer;
     delete checkFPStimer;
     tree->lockForWrite();
     _entities.getTree()->setSimulation(NULL);
     tree->unlock();
-    // ask the datagram processing thread to quit and wait until it is done
-    _nodeThread->quit();
-    _nodeThread->wait();
     _octreeProcessor.terminate();
     _entityEditSender.terminate();
     DependencyManager::destroy<GeometryCache>();
     //DependencyManager::destroy<ScriptCache>();
     DependencyManager::destroy<SoundCache>();
+    auto nodeList = DependencyManager::get<NodeList>();
+    QThread* nodeThread = nodeList->thread();
+    nodeList->deleteLater();
+    // ask the node thread to quit and wait until it is done
+    nodeThread->quit();
+    nodeThread->wait();
     qInstallMessageHandler(NULL); // NOTE: Do this as late as possible so we continue to get our log messages
 }
     _fps = (float)_frameCount / diffTime;
     _frameCount = 0;
-    _datagramProcessor.resetCounters();
+    _datagramProcessor->resetCounters();
     _timerStart.start();
     // ask the node list to check in with the domain server

Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList""

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code