summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2019-06-21 14:05:18 -0400
committerGravatar GitHub2019-06-21 14:05:18 -0400
commit96412848a9db0643198ea882824688f23dc19606 (patch)
tree2824eafaf4bc026cc3fc0ee498d1c5c623f3aa65 /src/core/core.cpp
parentMerge pull request #2291 from DarkLordZach/homebrew-testing (diff)
parentloader: Move NSO module tracking to AppLoader (diff)
downloadyuzu-96412848a9db0643198ea882824688f23dc19606.tar.gz
yuzu-96412848a9db0643198ea882824688f23dc19606.tar.xz
yuzu-96412848a9db0643198ea882824688f23dc19606.zip
Merge pull request #2482 from DarkLordZach/prepo
core: Add detailed local reporting feature for development
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index ff0721079..b72a1fd6a 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -29,6 +29,7 @@
29#include "core/hle/service/sm/sm.h" 29#include "core/hle/service/sm/sm.h"
30#include "core/loader/loader.h" 30#include "core/loader/loader.h"
31#include "core/perf_stats.h" 31#include "core/perf_stats.h"
32#include "core/reporter.h"
32#include "core/settings.h" 33#include "core/settings.h"
33#include "core/telemetry_session.h" 34#include "core/telemetry_session.h"
34#include "file_sys/cheat_engine.h" 35#include "file_sys/cheat_engine.h"
@@ -74,7 +75,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
74 return vfs->OpenFile(path, FileSys::Mode::Read); 75 return vfs->OpenFile(path, FileSys::Mode::Read);
75} 76}
76struct System::Impl { 77struct System::Impl {
77 explicit Impl(System& system) : kernel{system}, cpu_core_manager{system} {} 78 explicit Impl(System& system) : kernel{system}, cpu_core_manager{system}, reporter{system} {}
78 79
79 Cpu& CurrentCpuCore() { 80 Cpu& CurrentCpuCore() {
80 return cpu_core_manager.GetCurrentCore(); 81 return cpu_core_manager.GetCurrentCore();
@@ -253,6 +254,8 @@ struct System::Impl {
253 /// Telemetry session for this emulation session 254 /// Telemetry session for this emulation session
254 std::unique_ptr<Core::TelemetrySession> telemetry_session; 255 std::unique_ptr<Core::TelemetrySession> telemetry_session;
255 256
257 Reporter reporter;
258
256 ResultStatus status = ResultStatus::Success; 259 ResultStatus status = ResultStatus::Success;
257 std::string status_details = ""; 260 std::string status_details = "";
258 261
@@ -492,6 +495,10 @@ void System::ClearContentProvider(FileSys::ContentProviderUnionSlot slot) {
492 impl->content_provider->ClearSlot(slot); 495 impl->content_provider->ClearSlot(slot);
493} 496}
494 497
498const Reporter& System::GetReporter() const {
499 return impl->reporter;
500}
501
495System::ResultStatus System::Init(Frontend::EmuWindow& emu_window) { 502System::ResultStatus System::Init(Frontend::EmuWindow& emu_window) {
496 return impl->Init(*this, emu_window); 503 return impl->Init(*this, emu_window);
497} 504}