From 1cfd98b2d7703eb9561d111716947ad24ddcbce0 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Sat, 31 Jan 2015 00:50:12 -0800
Subject: [PATCH] Name threads

---
 assignment-client/src/audio/AudioMixer.cpp      | 1 +
 assignment-client/src/octree/OctreeServer.cpp   | 1 +
 interface/src/Application.cpp                   | 5 ++++-
 interface/src/ModelUploader.cpp                 | 1 +
 interface/src/ui/ModelsBrowser.cpp              | 1 +
 libraries/audio/src/AudioScriptingInterface.cpp | 1 +
 libraries/avatars/src/Player.cpp                | 1 +
 libraries/networking/src/AccountManager.cpp     | 1 +
 8 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index b7dfdd9b24..b862cd0c78 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -648,6 +648,7 @@ void AudioMixer::run() {
     
     // setup a QThread with us as parent that will house the AudioMixerDatagramProcessor
     _datagramProcessingThread = new QThread(this);
+    _datagramProcessingThread->setObjectName("Datagram Processor Thread");
     
     // create an AudioMixerDatagramProcessor and move it to that thread
     AudioMixerDatagramProcessor* datagramProcessor = new AudioMixerDatagramProcessor(nodeList->getNodeSocket(), thread());
diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index aaf37c2beb..85d4749b27 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -879,6 +879,7 @@ void OctreeServer::setupDatagramProcessingThread() {
     
     // 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());
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 8f31872437..f712899afa 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -281,6 +281,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
     _runningScriptsWidget = new RunningScriptsWidget(_window);
     
     // start the nodeThread so its event loop is running
+    _nodeThread->setObjectName("Datagram Processor Thread");
     _nodeThread->start();
 
     // make sure the node thread is given highest priority
@@ -295,6 +296,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 
     // put the audio processing on a separate thread
     QThread* audioThread = new QThread(this);
+    audioThread->setObjectName("Audio Thread");
     
     auto audioIO = DependencyManager::get<Audio>();
     audioIO->moveToThread(audioThread);
@@ -452,7 +454,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
     loadSettings();
     int SAVE_SETTINGS_INTERVAL = 10 * MSECS_PER_SECOND; // Let's save every seconds for now
     connect(&_settingsTimer, &QTimer::timeout, this, &Application::saveSettings);
-    connect(&_settingsThread, SIGNAL(started), &_settingsTimer, SLOT(start));
+    connect(&_settingsThread, SIGNAL(started()), &_settingsTimer, SLOT(start()));
     connect(&_settingsThread, &QThread::finished, &_settingsTimer, &QTimer::deleteLater);
     _settingsTimer.moveToThread(&_settingsThread);
     _settingsTimer.setSingleShot(false);
@@ -3491,6 +3493,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
 #endif
 
     QThread* workerThread = new QThread(this);
+    workerThread->setObjectName("Script Engine Thread");
 
     // when the worker thread is started, call our engine's run..
     connect(workerThread, &QThread::started, scriptEngine, &ScriptEngine::run);
diff --git a/interface/src/ModelUploader.cpp b/interface/src/ModelUploader.cpp
index a3e9a0a281..fcea2bd4cf 100644
--- a/interface/src/ModelUploader.cpp
+++ b/interface/src/ModelUploader.cpp
@@ -76,6 +76,7 @@ namespace SettingHandles {
 void ModelUploader::uploadModel(ModelType modelType) {
     ModelUploader* uploader = new ModelUploader(modelType);
     QThread* thread = new QThread();
+    thread->setObjectName("Model Uploader");
     thread->connect(uploader, SIGNAL(destroyed()), SLOT(quit()));
     thread->connect(thread, SIGNAL(finished()), SLOT(deleteLater()));
     uploader->connect(thread, SIGNAL(started()), SLOT(send()));
diff --git a/interface/src/ui/ModelsBrowser.cpp b/interface/src/ui/ModelsBrowser.cpp
index e22294876d..070c6a85cc 100644
--- a/interface/src/ui/ModelsBrowser.cpp
+++ b/interface/src/ui/ModelsBrowser.cpp
@@ -85,6 +85,7 @@ ModelsBrowser::ModelsBrowser(ModelType modelsType, QWidget* parent) :
     
     // Setup and launch update thread
     QThread* thread = new QThread();
+    thread->setObjectName("Models Browser");
     thread->connect(_handler, SIGNAL(destroyed()), SLOT(quit()));
     thread->connect(thread, SIGNAL(finished()), SLOT(deleteLater()));
     _handler->moveToThread(thread);
diff --git a/libraries/audio/src/AudioScriptingInterface.cpp b/libraries/audio/src/AudioScriptingInterface.cpp
index 120c7a6b5a..58b72f3fcd 100644
--- a/libraries/audio/src/AudioScriptingInterface.cpp
+++ b/libraries/audio/src/AudioScriptingInterface.cpp
@@ -53,6 +53,7 @@ AudioInjector* AudioScriptingInterface::playSound(Sound* sound, const AudioInjec
         injector->setLocalAudioInterface(_localAudioInterface);
         
         QThread* injectorThread = new QThread();
+        injectorThread->setObjectName("Audio Injector Thread");
         
         injector->moveToThread(injectorThread);
         
diff --git a/libraries/avatars/src/Player.cpp b/libraries/avatars/src/Player.cpp
index e67ceb2dc3..2fabc39bac 100644
--- a/libraries/avatars/src/Player.cpp
+++ b/libraries/avatars/src/Player.cpp
@@ -166,6 +166,7 @@ void Player::pausePlayer() {
 
 void Player::setupAudioThread() {
     _audioThread = new QThread();
+    _audioThread->setObjectName("Player Audio Thread");
     _options.position = _avatar->getPosition();
     _options.orientation = _avatar->getOrientation();
     _injector.reset(new AudioInjector(_recording->getAudioData(), _options), &QObject::deleteLater);
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index ee741b8890..34635ec188 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -497,6 +497,7 @@ void AccountManager::requestProfileError(QNetworkReply::NetworkError error) {
 void AccountManager::generateNewKeypair() {
     // setup a new QThread to generate the keypair on, in case it takes a while
     QThread* generateThread = new QThread(this);
+    generateThread->setObjectName("Account Manager Generator Thread");
     
     // setup a keypair generator
     RSAKeypairGenerator* keypairGenerator = new RSAKeypairGenerator();