Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:01:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move --traceFile option to start of main()

Browse source
This commit is contained in:
Simon Walton 2018-04-09 15:45:58 -07:00
parent 9b6306601a
commit 513a4875f0
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -959,6 +959,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning())); setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
setProperty(hifi::properties::CRASHED, _previousSessionCrashed); setProperty(hifi::properties::CRASHED, _previousSessionCrashed);
#if 0
{ {
const QString TEST_SCRIPT = "--testScript"; const QString TEST_SCRIPT = "--testScript";
const QString TRACE_FILE = "--traceFile"; const QString TRACE_FILE = "--traceFile";
@ -976,6 +977,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
} }
} }
} }
#endif
// make sure the debug draw singleton is initialized on the main thread. // make sure the debug draw singleton is initialized on the main thread.
DebugDraw::getInstance().removeMarker(""); DebugDraw::getInstance().removeMarker("");

15
interface/src/main.cpp
View file

@ -42,9 +42,18 @@ extern "C" {
int main(int argc, const char* argv[]) { int main(int argc, const char* argv[]) {
setupHifiApplication(BuildInfo::INTERFACE_NAME); setupHifiApplication(BuildInfo::INTERFACE_NAME);
auto tracer = DependencyManager::set<tracing::Tracer>(); auto tracer = DependencyManager::set<tracing::Tracer>();
tracer->startTracing(); const char * traceFile = "";
{
for (int a = 1; a < argc; ++a) {
if (strcmp(argv[a], "--traceFile") == 0 && argc > a + 1) {
traceFile = argv[a + 1];
tracer->startTracing();
break;
}
}
}
PROFILE_SYNC_BEGIN(startup, "main startup", ""); PROFILE_SYNC_BEGIN(startup, "main startup", "");
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar); QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
#endif #endif
@ -283,7 +292,7 @@ int main(int argc, const char* argv[]) {
server.close(); server.close();
tracer->stopTracing(); tracer->stopTracing();
tracer->serialize(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation) + "/Traces/trace-startup.json.gz"); tracer->serialize(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/" + traceFile);
} }
Application::shutdownPlugins(); Application::shutdownPlugins();