Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sm: Relocate the service manager to the System class

Browse source 
Rather than have it live as a global variable, place it into the System class and make it instance-based.
This commit is contained in:
Lioncash 2018-04-12 23:06:21 -04:00
parent bfd1d963ba
commit a78920e60b
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
6 changed files with 69 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/core/core.cpp
View file

@ -15,10 +15,12 @@
#include "core/core.h"
#include "core/core_timing.h"
#include "core/gdbstub/gdbstub.h"
#include "core/hle/kernel/client_port.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/process.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h"
#include "core/hw/hw.h"
#include "core/loader/loader.h"
#include "core/memory_setup.h"
@ -168,10 +170,11 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
dsp_core->EnableStretching(Settings::values.enable_audio_stretching);
telemetry_session = std::make_unique<Core::TelemetrySession>();
service_manager = std::make_shared<Service::SM::ServiceManager>();
HW::Init();
Kernel::Init(system_mode);
Service::Init();
Service::Init(service_manager);
GDBStub::Init();
Movie::GetInstance().Init();
@ -188,6 +191,14 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
return ResultStatus::Success;
}
Service::SM::ServiceManager& System::ServiceManager() {
return *service_manager;
}
const Service::SM::ServiceManager& System::ServiceManager() const {
return *service_manager;
}
void System::Shutdown() {
// Log last frame performance stats
auto perf_results = GetAndResetPerfStats();
@ -205,11 +216,12 @@ void System::Shutdown() {
Service::Shutdown();
Kernel::Shutdown();
HW::Shutdown();
telemetry_session = nullptr;
dsp_core = nullptr;
cpu_core = nullptr;
telemetry_session.reset();
service_manager.reset();
dsp_core.reset();
cpu_core.reset();
CoreTiming::Shutdown();
app_loader = nullptr;
app_loader.reset();
if (auto room_member = Network::GetRoomMember().lock()) {
Network::GameInfo game_info{};