make NodeList deleter be deleteLater

assignment-client/src/AssignmentClient.cpp

@@ -62,6 +62,17 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
     DependencyManager::registerInheritance<EntityActionFactoryInterface, AssignmentActionFactory>();
     auto actionFactory = DependencyManager::set<AssignmentActionFactory>();
 
+    // setup a thread for the NodeList and its PacketReceiver
+    QThread* nodeThread = new QThread(this);
+    nodeThread->setObjectName("NodeList Thread");
+    nodeThread->start();
+
+    // make sure the node thread is given highest priority
+    nodeThread->setPriority(QThread::TimeCriticalPriority);
+
+    // put the NodeList on the node thread
+    nodeList->moveToThread(nodeThread);
+
     // make up a uuid for this child so the parent can tell us apart.  This id will be changed
     // when the domain server hands over an assignment.
     QUuid nodeUUID = QUuid::createUuid();
@@ -124,7 +135,6 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
     packetReceiver.registerListener(PacketType::CreateAssignment, this, "handleCreateAssignmentPacket");
     packetReceiver.registerListener(PacketType::StopNode, this, "handleStopNodePacket");
 }
-
 void AssignmentClient::stopAssignmentClient() {
     qDebug() << "Forced stop of assignment-client.";
 
@@ -150,6 +160,16 @@ void AssignmentClient::stopAssignmentClient() {
     }
 }
 
+AssignmentClient::~AssignmentClient() {
+    QThread* nodeThread = DependencyManager::get<NodeList>()->thread();
+    
+    // remove the NodeList from the DependencyManager
+    DependencyManager::destroy<NodeList>();
+
+    // ask the node thread to quit and wait until it is done
+    nodeThread->quit();
+    nodeThread->wait();
+}
 
 void AssignmentClient::aboutToQuit() {
     stopAssignmentClient();
@@ -251,9 +271,6 @@ void AssignmentClient::handleCreateAssignmentPacket(QSharedPointer<NLPacket> pac
 
         _currentAssignment->moveToThread(workerThread);
 
-        // move the NodeList to the thread used for the _current assignment
-        nodeList->moveToThread(workerThread);
-
         // Starts an event loop, and emits workerThread->started()
         workerThread->start();
     } else {

assignment-client/src/AssignmentClient.h

@@ -24,10 +24,10 @@ class QSharedMemory;
 class AssignmentClient : public QObject, public PacketListener {
     Q_OBJECT
 public:
-
     AssignmentClient(Assignment::Type requestAssignmentType, QString assignmentPool,
                      QUuid walletUUID, QString assignmentServerHostname, quint16 assignmentServerPort,
                      quint16 assignmentMonitorPort);
+    ~AssignmentClient();
 private slots:
     void sendAssignmentRequest();
     void assignmentCompleted();

assignment-client/src/audio/AudioMixer.cpp

@@ -52,7 +52,6 @@
 
 #include "AudioRingBuffer.h"
 #include "AudioMixerClientData.h"
-#include "AudioMixerDatagramProcessor.h"
 #include "AvatarAudioStream.h"
 #include "InjectedAudioStream.h"
 
@@ -657,10 +656,6 @@ void AudioMixer::run() {
     // we do not want this event loop to be the handler for UDP datagrams, so disconnect
     disconnect(&nodeList->getNodeSocket(), 0, this, 0);
 
-    // setup a QThread with us as parent that will house the AudioMixerDatagramProcessor
-    _datagramProcessingThread = new QThread(this);
-    _datagramProcessingThread->setObjectName("Datagram Processor Thread");
-
     nodeList->addNodeTypeToInterestSet(NodeType::Agent);
 
     nodeList->linkedDataCreateCallback = [](Node* node) {

assignment-client/src/audio/AudioMixerDatagramProcessor.cpp

@@ -1,47 +0,0 @@
-//
-//  AudioMixerDatagramProcessor.cpp
-//  assignment-client/src
-//
-//  Created by Stephen Birarda on 2014-08-14.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include <QDebug>
-
-#include <HifiSockAddr.h>
-#include <NodeList.h>
-
-#include "AudioMixerDatagramProcessor.h"
-
-AudioMixerDatagramProcessor::AudioMixerDatagramProcessor(QUdpSocket& nodeSocket, QThread* previousNodeSocketThread) :
-    _nodeSocket(nodeSocket),
-    _previousNodeSocketThread(previousNodeSocketThread)
-{
-    
-}
-
-AudioMixerDatagramProcessor::~AudioMixerDatagramProcessor() {    
-    // return the node socket to its previous thread
-    _nodeSocket.moveToThread(_previousNodeSocketThread);
-}
-
-void AudioMixerDatagramProcessor::readPendingDatagrams() {
-    
-    HifiSockAddr senderSockAddr;
-    static QByteArray incomingPacket;
-    
-    // read everything that is available
-    while (_nodeSocket.hasPendingDatagrams()) {
-        incomingPacket.resize(_nodeSocket.pendingDatagramSize());
-        
-        // just get this packet off the stack
-        _nodeSocket.readDatagram(incomingPacket.data(), incomingPacket.size(),
-                                  senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer());
-        
-        // emit the signal to tell AudioMixer it needs to process a packet
-        emit packetRequiresProcessing(incomingPacket, senderSockAddr);
-    }
-}

assignment-client/src/audio/AudioMixerDatagramProcessor.h

@@ -1,32 +0,0 @@
-//
-//  AudioMixerDatagramProcessor.h
-//  assignment-client/src
-//
-//  Created by Stephen Birarda on 2014-08-14.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_AudioMixerDatagramProcessor_h
-#define hifi_AudioMixerDatagramProcessor_h
-
-#include <qobject.h>
-#include <qudpsocket.h>
-
-class AudioMixerDatagramProcessor : public QObject {
-    Q_OBJECT
-public:
-    AudioMixerDatagramProcessor(QUdpSocket& nodeSocket, QThread* previousNodeSocketThread);
-    ~AudioMixerDatagramProcessor();
-public slots:
-    void readPendingDatagrams();
-signals:
-    void packetRequiresProcessing(const QByteArray& receivedPacket, const HifiSockAddr& senderSockAddr);
-private:
-    QUdpSocket& _nodeSocket;
-    QThread* _previousNodeSocketThread;
-};
-
-#endif // hifi_AudioMixerDatagramProcessor_h

assignment-client/src/octree/OctreeServer.cpp

@@ -838,36 +838,6 @@ void OctreeServer::handleJurisdictionRequestPacket(QSharedPointer<NLPacket> pack
     _jurisdictionSender->queueReceivedPacket(packet, senderNode);
 }
 
-void OctreeServer::setupDatagramProcessingThread() {
-    auto nodeList = DependencyManager::get<NodeList>();
-
-    // we do not want this event loop to be the handler for UDP datagrams, so disconnect
-    disconnect(&nodeList->getNodeSocket(), 0, this, 0);
-
-    // setup a QThread with us as parent that will house the OctreeServerDatagramProcessor
-    _datagramProcessingThread = new QThread(this);
-    _datagramProcessingThread->setObjectName("Octree Datagram Processor");
-
-    // create an OctreeServerDatagramProcessor and move it to that thread
-    OctreeServerDatagramProcessor* datagramProcessor = new OctreeServerDatagramProcessor(nodeList->getNodeSocket(), thread());
-    datagramProcessor->moveToThread(_datagramProcessingThread);
-
-    // remove the NodeList as the parent of the node socket
-    nodeList->getNodeSocket().setParent(NULL);
-    nodeList->getNodeSocket().moveToThread(_datagramProcessingThread);
-
-    // let the datagram processor handle readyRead from node socket
-    connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead,
-            datagramProcessor, &OctreeServerDatagramProcessor::readPendingDatagrams);
-
-    // delete the datagram processor and the associated thread when the QThread quits
-    connect(_datagramProcessingThread, &QThread::finished, datagramProcessor, &QObject::deleteLater);
-    connect(datagramProcessor, &QObject::destroyed, _datagramProcessingThread, &QThread::deleteLater);
-
-    // start the datagram processing thread
-    _datagramProcessingThread->start();
-}
-
 bool OctreeServer::readOptionBool(const QString& optionName, const QJsonObject& settingsSectionObject, bool& result) {
     result = false; // assume it doesn't exist
     bool optionAvailable = false;
@@ -1079,15 +1049,13 @@ void OctreeServer::run() {
     // use common init to setup common timers and logging
     commonInit(getMyLoggingServerTargetName(), getMyNodeType());
 
-    setupDatagramProcessingThread();
-
     // read the configuration from either the payload or the domain server configuration
     readConfiguration();
 
     beforeRun(); // after payload has been processed
 
     connect(nodeList.data(), SIGNAL(nodeAdded(SharedNodePointer)), SLOT(nodeAdded(SharedNodePointer)));
-    connect(nodeList.data(), SIGNAL(nodeKilled(SharedNodePointer)),SLOT(nodeKilled(SharedNodePointer)));
+    connect(nodeList.data(), SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer)));
 
 
     // we need to ask the DS about agents so we can ping/reply with them

assignment-client/src/octree/OctreeServer.h

@@ -145,8 +145,6 @@ protected:
     QString getConfiguration();
     QString getStatusLink();
 
-    void setupDatagramProcessingThread();
-
     int _argc;
     const char** _argv;
     char** _parsedArgV;

interface/src/Application.cpp

@@ -380,17 +380,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 
     // start the nodeThread so its event loop is running
     QThread* nodeThread = new QThread(this);
-    nodeThread->setObjectName("Datagram Processor Thread");
+    nodeThread->setObjectName("NodeList Thread");
     nodeThread->start();
 
     // make sure the node thread is given highest priority
     nodeThread->setPriority(QThread::TimeCriticalPriority);
 
-    // have the NodeList use deleteLater from DM customDeleter
-    nodeList->setCustomDeleter([](Dependency* dependency) {
-        static_cast<NodeList*>(dependency)->deleteLater();
-    });
-
     // setup a timer for domain-server check ins
     QTimer* domainCheckInTimer = new QTimer(nodeList.data());
     connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
@@ -748,6 +743,8 @@ Application::~Application() {
     DependencyManager::destroy<SoundCache>();
 
     QThread* nodeThread = DependencyManager::get<NodeList>()->thread();
+    
+    // remove the NodeList from the DependencyManager
     DependencyManager::destroy<NodeList>();
 
     // ask the node thread to quit and wait until it is done

libraries/networking/src/NodeList.cpp

@@ -45,6 +45,11 @@ NodeList::NodeList(char newOwnerType, unsigned short socketListenPort, unsigned
         qRegisterMetaType<SharedNodePointer>();
         firstCall = false;
     }
+
+    setCustomDeleter([](Dependency* dependency){
+        static_cast<NodeList*>(dependency)->deleteLater();
+    });
+    
     auto addressManager = DependencyManager::get<AddressManager>();
 
     // handle domain change signals from AddressManager

libraries/networking/src/NodeList.h

@@ -112,8 +112,6 @@ private:
     DomainHandler _domainHandler;
     int _numNoReplyDomainCheckIns;
     HifiSockAddr _assignmentServerSocket;
-
-    friend class Application;
 };
 
 #endif // hifi_NodeList_h

libraries/networking/src/PacketReceiverListener.h

@@ -1,22 +0,0 @@
-//
-//  PacketListener.h
-//  libraries/networking/src
-//
-//  Created by Stephen Birarda on 07/14/15.
-//  Copyright 2015 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_PacketListener_h
-#define hifi_PacketListener_h
-
-#pragma once
-
-class PacketListener {
-public:
-    virtual ~PacketListener();
-};
-
-#endif // hifi_PacketListener_h

libraries/networking/src/ThreadedAssignment.cpp

@@ -20,8 +20,8 @@
 
 ThreadedAssignment::ThreadedAssignment(NLPacket& packet) :
     Assignment(packet),
-    _isFinished(false),
+    _isFinished(false)
-    _datagramProcessingThread(NULL)
+
 {
 
 }
@@ -42,31 +42,9 @@ void ThreadedAssignment::setFinished(bool isFinished) {
                 _statsTimer->stop();
             }
 
-            // stop processing datagrams from the node socket
-            // this ensures we won't process a domain list while we are going down
-            auto nodeList = DependencyManager::get<NodeList>();
-            disconnect(&nodeList->getNodeSocket(), 0, this, 0);
-
             // call our virtual aboutToFinish method - this gives the ThreadedAssignment subclass a chance to cleanup
             aboutToFinish();
 
-            // if we have a datagram processing thread, quit it and wait on it to make sure that
-            // the node socket is back on the same thread as the NodeList
-
-
-            if (_datagramProcessingThread) {
-                // tell the datagram processing thread to quit and wait until it is done,
-                // then return the node socket to the NodeList
-                _datagramProcessingThread->quit();
-                _datagramProcessingThread->wait();
-
-                // set node socket parent back to NodeList
-                nodeList->getNodeSocket().setParent(nodeList.data());
-            }
-
-            // move the NodeList back to the QCoreApplication instance's thread
-            nodeList->moveToThread(QCoreApplication::instance()->thread());
-
             emit finished();
         }
     }
@@ -120,16 +98,3 @@ void ThreadedAssignment::checkInWithDomainServerOrExit() {
         DependencyManager::get<NodeList>()->sendDomainServerCheckIn();
     }
 }
-
-bool ThreadedAssignment::readAvailableDatagram(QByteArray& destinationByteArray, HifiSockAddr& senderSockAddr) {
-    auto nodeList = DependencyManager::get<NodeList>();
-
-    if (nodeList->getNodeSocket().hasPendingDatagrams()) {
-        destinationByteArray.resize(nodeList->getNodeSocket().pendingDatagramSize());
-        nodeList->getNodeSocket().readDatagram(destinationByteArray.data(), destinationByteArray.size(),
-                                               senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer());
-        return true;
-    } else {
-        return false;
-    }
-}

libraries/networking/src/ThreadedAssignment.h

@@ -38,10 +38,8 @@ signals:
     void finished();
 
 protected:
-    bool readAvailableDatagram(QByteArray& destinationByteArray, HifiSockAddr& senderSockAddr);
     void commonInit(const QString& targetName, NodeType_t nodeType, bool shouldSendStats = true);
     bool _isFinished;
-    QThread* _datagramProcessingThread;
     QTimer* _domainServerTimer = nullptr;
     QTimer* _statsTimer = nullptr;