Showing the changes to interface/src/Application.cpp (1 of 50 files). Show all
Unified · Split
| @@ -490,7 +490,7 @@ public: · 489 unmodified lines | |||
| 490 | // Don't actually crash in debug builds, in case this apparent deadlock is simply from | 490 | // Don't actually crash in debug builds, in case this apparent deadlock is simply from |
| 491 | // the developer actively debugging code | 491 | // the developer actively debugging code |
| 492 | #ifdef NDEBUG | 492 | #ifdef NDEBUG |
| 493 | deadlockDetectionCrash(); | 493 | deadlockDetectionCrash(); |
| 494 | #endif | 494 | #endif |
| 495 | } | 495 | } |
| 496 | } | 496 | } |
| @@ -773,7 +773,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 276 unmodified lines | |||
| 773 | steamClient->init(); | 773 | steamClient->init(); |
| 774 | } | 774 | } |
| 775 | 775 | ||
| 776 | DependencyManager::set<tracing::Tracer>(); | ||
| 777 | PROFILE_SET_THREAD_NAME("Main Thread"); | 776 | PROFILE_SET_THREAD_NAME("Main Thread"); |
| 778 | 777 | ||
| 779 | #if defined(Q_OS_WIN) | 778 | #if defined(Q_OS_WIN) |
| @@ -958,10 +957,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 178 unmodified lines | |||
| 958 | auto steamClient = PluginManager::getInstance()->getSteamClientPlugin(); | 957 | auto steamClient = PluginManager::getInstance()->getSteamClientPlugin(); |
| 959 | setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning())); | 958 | setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning())); |
| 960 | setProperty(hifi::properties::CRASHED, _previousSessionCrashed); | 959 | setProperty(hifi::properties::CRASHED, _previousSessionCrashed); |
| 961 | |||
| 962 | { | 960 | { |
| 963 | const QString TEST_SCRIPT = "--testScript"; | 961 | const QString TEST_SCRIPT = "--testScript"; |
| 964 | const QString TRACE_FILE = "--traceFile"; | ||
| 965 | const QStringList args = arguments(); | 962 | const QStringList args = arguments(); |
| 966 | for (int i = 0; i < args.size() - 1; ++i) { | 963 | for (int i = 0; i < args.size() - 1; ++i) { |
| 967 | if (args.at(i) == TEST_SCRIPT) { | 964 | if (args.at(i) == TEST_SCRIPT) { |
| @@ -969,10 +966,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1 unmodified line | |||
| 969 | if (QFileInfo(testScriptPath).exists()) { | 966 | if (QFileInfo(testScriptPath).exists()) { |
| 970 | setProperty(hifi::properties::TEST, QUrl::fromLocalFile(testScriptPath)); | 967 | setProperty(hifi::properties::TEST, QUrl::fromLocalFile(testScriptPath)); |
| 971 | } | 968 | } |
| 972 | } else if (args.at(i) == TRACE_FILE) { | ||
| 973 | QString traceFilePath = args.at(i + 1); | ||
| 974 | setProperty(hifi::properties::TRACING, traceFilePath); | ||
| 975 | DependencyManager::get<tracing::Tracer>()->startTracing(); | ||
| 976 | } | 969 | } |
| 977 | } | 970 | } |
| 978 | } | 971 | } |
| @@ -1018,6 +1011,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 39 unmodified lines | |||
| 1018 | auto nodeList = DependencyManager::get<NodeList>(); | 1011 | auto nodeList = DependencyManager::get<NodeList>(); |
| 1019 | nodeList->startThread(); | 1012 | nodeList->startThread(); |
| 1020 | 1013 | ||
| 1014 | const char** constArgv = const_cast<const char**>(argv); | ||
| 1015 | if (cmdOptionExists(argc, constArgv, "--disableWatchdog")) { | ||
| 1016 | DISABLE_WATCHDOG = true; | ||
| 1017 | } | ||
| 1021 | // Set up a watchdog thread to intentionally crash the application on deadlocks | 1018 | // Set up a watchdog thread to intentionally crash the application on deadlocks |
| 1022 | if (!DISABLE_WATCHDOG) { | 1019 | if (!DISABLE_WATCHDOG) { |
| 1023 | (new DeadlockWatchdogThread())->start(); | 1020 | (new DeadlockWatchdogThread())->start(); |
| @@ -1227,7 +1224,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 203 unmodified lines | |||
| 1227 | connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent); | 1224 | connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent); |
| 1228 | connect(&_entityEditSender, &EntityEditPacketSender::addingEntityWithCertificate, this, &Application::addingEntityWithCertificate); | 1225 | connect(&_entityEditSender, &EntityEditPacketSender::addingEntityWithCertificate, this, &Application::addingEntityWithCertificate); |
| 1229 | 1226 | ||
| 1230 | const char** constArgv = const_cast<const char**>(argv); | ||
| 1231 | QString concurrentDownloadsStr = getCmdOption(argc, constArgv, "--concurrent-downloads"); | 1227 | QString concurrentDownloadsStr = getCmdOption(argc, constArgv, "--concurrent-downloads"); |
| 1232 | bool success; | 1228 | bool success; |
| 1233 | int concurrentDownloads = concurrentDownloadsStr.toInt(&success); | 1229 | int concurrentDownloads = concurrentDownloadsStr.toInt(&success); |