aboutsummaryrefslogtreecommitdiff
path: root/src/citra/citra.cpp
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-08-17 18:25:21 -0300
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-08-24 22:16:28 -0300
commit0fcabd2b11a5b1d4d16f6f6bdf1efd54d2c45237 (patch)
treea1651d48113413e2de1e6e309362511b1ff7ffa8 /src/citra/citra.cpp
parentc7745408f77a17771c1a26efb981d79aa66c9f66 (diff)
Integrate the MicroProfile profiling library
This brings goodies such as a configurable user interface and multi-threaded timeline view.
Diffstat (limited to 'src/citra/citra.cpp')
-rw-r--r--src/citra/citra.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index d6fcb66a5f..46f4a07c94 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -6,6 +6,9 @@
#include <thread>
#include <iostream>
+// This needs to be included before getopt.h because the latter #defines symbols used by it
+#include "common/microprofile.h"
+
#ifdef _MSC_VER
#include <getopt.h>
#else
@@ -59,6 +62,8 @@ int main(int argc, char **argv) {
Log::Filter log_filter(Log::Level::Debug);
Log::SetFilter(&log_filter);
+ MicroProfileOnThreadCreate("EmuThread");
+
if (boot_filename.empty()) {
LOG_CRITICAL(Frontend, "Failed to load ROM: No ROM specified");
return -1;
@@ -89,5 +94,7 @@ int main(int argc, char **argv) {
delete emu_window;
+ MicroProfileShutdown();
+
return 0;
}