core: Add LM::Manager to system

Allows centralized control over logging mechanisms.
This commit is contained in:
Zach Hilman 2019-06-29 17:17:35 -04:00
parent 82bf055eca
commit 4153bd8d17
6 changed files with 39 additions and 19 deletions

View file

@ -324,6 +324,8 @@ add_library(core STATIC
hle/service/ldr/ldr.h hle/service/ldr/ldr.h
hle/service/lm/lm.cpp hle/service/lm/lm.cpp
hle/service/lm/lm.h hle/service/lm/lm.h
hle/service/lm/manager.cpp
hle/service/lm/manager.h
hle/service/mig/mig.cpp hle/service/mig/mig.cpp
hle/service/mig/mig.h hle/service/mig/mig.h
hle/service/mii/mii.cpp hle/service/mii/mii.cpp

View file

@ -35,6 +35,7 @@
#include "core/hle/service/apm/controller.h" #include "core/hle/service/apm/controller.h"
#include "core/hle/service/filesystem/filesystem.h" #include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/glue/manager.h" #include "core/hle/service/glue/manager.h"
#include "core/hle/service/lm/manager.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/sm.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
@ -337,6 +338,7 @@ struct System::Impl {
bool is_powered_on = false; bool is_powered_on = false;
bool exit_lock = false; bool exit_lock = false;
Reporter reporter;
std::unique_ptr<Memory::CheatEngine> cheat_engine; std::unique_ptr<Memory::CheatEngine> cheat_engine;
std::unique_ptr<Tools::Freezer> memory_freezer; std::unique_ptr<Tools::Freezer> memory_freezer;
@ -346,8 +348,9 @@ struct System::Impl {
/// APM (Performance) services /// APM (Performance) services
Service::APM::Controller apm_controller{core_timing}; Service::APM::Controller apm_controller{core_timing};
/// Glue services /// Service State
Service::Glue::ARPManager arp_manager; Service::Glue::ARPManager arp_manager;
Service::LM::Manager lm_manager{reporter};
/// Service manager /// Service manager
std::shared_ptr<Service::SM::ServiceManager> service_manager; std::shared_ptr<Service::SM::ServiceManager> service_manager;
@ -355,8 +358,6 @@ struct System::Impl {
/// Telemetry session for this emulation session /// Telemetry session for this emulation session
std::unique_ptr<Core::TelemetrySession> telemetry_session; std::unique_ptr<Core::TelemetrySession> telemetry_session;
Reporter reporter;
ResultStatus status = ResultStatus::Success; ResultStatus status = ResultStatus::Success;
std::string status_details = ""; std::string status_details = "";
@ -632,6 +633,14 @@ const Service::APM::Controller& System::GetAPMController() const {
return impl->apm_controller; return impl->apm_controller;
} }
Service::LM::Manager& System::GetLogManager() {
return impl->lm_manager;
}
const Service::LM::Manager& System::GetLogManager() const {
return impl->lm_manager;
}
void System::SetExitLock(bool locked) { void System::SetExitLock(bool locked) {
impl->exit_lock = locked; impl->exit_lock = locked;
} }

View file

@ -58,6 +58,10 @@ namespace Glue {
class ARPManager; class ARPManager;
} }
namespace LM {
class Manager;
} // namespace LM
namespace SM { namespace SM {
class ServiceManager; class ServiceManager;
} // namespace SM } // namespace SM
@ -326,6 +330,10 @@ public:
const Service::APM::Controller& GetAPMController() const; const Service::APM::Controller& GetAPMController() const;
Service::LM::Manager& GetLogManager();
const Service::LM::Manager& GetLogManager() const;
void SetExitLock(bool locked); void SetExitLock(bool locked);
bool GetExitLock() const; bool GetExitLock() const;

View file

@ -6,8 +6,10 @@
#include <string> #include <string>
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/scope_exit.h"
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/service/lm/lm.h" #include "core/hle/service/lm/lm.h"
#include "core/hle/service/lm/manager.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
#include "core/memory.h" #include "core/memory.h"
@ -194,31 +196,30 @@ private:
class LM final : public ServiceFramework<LM> { class LM final : public ServiceFramework<LM> {
public: public:
explicit LM() : ServiceFramework{"lm"} { explicit LM(Manager& manager) : ServiceFramework{"lm"}, manager(manager) {
// clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0x00000000, &LM::OpenLogger, "OpenLogger"}, {0, &LM::OpenLogger, "OpenLogger"},
}; };
// clang-format on
RegisterHandlers(functions); RegisterHandlers(functions);
} }
/** private:
* LM::OpenLogger service function
* Inputs:
* 0: 0x00000000
* Outputs:
* 0: ResultCode
*/
void OpenLogger(Kernel::HLERequestContext& ctx) { void OpenLogger(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_LM, "called"); LOG_DEBUG(Service_LM, "called");
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.PushIpcInterface<ILogger>(); rb.PushIpcInterface<ILogger>(manager);
} }
Manager& manager;
}; };
void InstallInterfaces(SM::ServiceManager& service_manager) { void InstallInterfaces(Core::System& system) {
std::make_shared<LM>()->InstallAsService(service_manager); std::make_shared<LM>(system.GetLogManager())->InstallAsService(system.ServiceManager());
} }
} // namespace Service::LM } // namespace Service::LM

View file

@ -4,13 +4,13 @@
#pragma once #pragma once
namespace Service::SM { namespace Core {
class ServiceManager; class System;
} }
namespace Service::LM { namespace Service::LM {
/// Registers all LM services with the specified service manager. /// Registers all LM services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& service_manager); void InstallInterfaces(Core::System& system);
} // namespace Service::LM } // namespace Service::LM

View file

@ -226,7 +226,7 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system) {
LBL::InstallInterfaces(*sm); LBL::InstallInterfaces(*sm);
LDN::InstallInterfaces(*sm); LDN::InstallInterfaces(*sm);
LDR::InstallInterfaces(*sm, system); LDR::InstallInterfaces(*sm, system);
LM::InstallInterfaces(*sm); LM::InstallInterfaces(system);
Migration::InstallInterfaces(*sm); Migration::InstallInterfaces(*sm);
Mii::InstallInterfaces(*sm); Mii::InstallInterfaces(*sm);
MM::InstallInterfaces(*sm); MM::InstallInterfaces(*sm);