From f2638637f700de3684f4c7921d4bc69cf76b82e7 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 29 Dec 2016 16:41:09 -0800 Subject: [PATCH] Add thread names to traces --- interface/src/Application.cpp | 1 + .../src/display-plugins/OpenGLDisplayPlugin.cpp | 2 ++ libraries/script-engine/src/ScriptEngine.cpp | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index cfbaee7ade..d39ad337a8 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -436,6 +436,7 @@ bool setupEssentials(int& argc, char** argv) { } DependencyManager::set(); + PROFILE_SET_THREAD_NAME("Main Thread"); #if defined(Q_OS_WIN) // Select appropriate audio DLL diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index 574c574f66..cf6b39812a 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -118,6 +118,8 @@ public: virtual void run() override { + PROFILE_SET_THREAD_NAME("Present Thread"); + // FIXME determine the best priority balance between this and the main thread... // It may be dependent on the display plugin being used, since VR plugins should // have higher priority on rendering (although we could say that the Oculus plugin diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 2191d45d45..7f5931b1e7 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -863,6 +863,10 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi } void ScriptEngine::run() { + auto filenameParts = _fileNameString.split("/"); + auto name = filenameParts.size() > 0 ? filenameParts[filenameParts.size() - 1] : "unknown"; + PROFILE_SET_THREAD_NAME("Script: " + name); + if (DependencyManager::get()->isStopped()) { return; // bail early - avoid setting state in init(), as evaluate() will bail too }