mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 17:23:24 +02:00
Merge pull request #2612 from DarkLordZach/prepo-new
prepo: Implement New, System, and Non-User variants of SaveReport
This commit is contained in:
commit
a1b8e5d09a
@ -2,34 +2,31 @@
|
|||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <json.hpp>
|
|
||||||
#include "common/file_util.h"
|
|
||||||
#include "common/hex_util.h"
|
#include "common/hex_util.h"
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "common/scm_rev.h"
|
|
||||||
#include "core/hle/ipc_helpers.h"
|
#include "core/hle/ipc_helpers.h"
|
||||||
#include "core/hle/kernel/process.h"
|
#include "core/hle/kernel/process.h"
|
||||||
#include "core/hle/service/acc/profile_manager.h"
|
#include "core/hle/service/acc/profile_manager.h"
|
||||||
#include "core/hle/service/prepo/prepo.h"
|
#include "core/hle/service/prepo/prepo.h"
|
||||||
#include "core/hle/service/service.h"
|
#include "core/hle/service/service.h"
|
||||||
#include "core/reporter.h"
|
#include "core/reporter.h"
|
||||||
#include "core/settings.h"
|
|
||||||
|
|
||||||
namespace Service::PlayReport {
|
namespace Service::PlayReport {
|
||||||
|
|
||||||
class PlayReport final : public ServiceFramework<PlayReport> {
|
class PlayReport final : public ServiceFramework<PlayReport> {
|
||||||
public:
|
public:
|
||||||
explicit PlayReport(const char* name) : ServiceFramework{name} {
|
explicit PlayReport(Core::System& system, const char* name)
|
||||||
|
: ServiceFramework{name}, system(system) {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{10100, nullptr, "SaveReportOld"},
|
{10100, &PlayReport::SaveReport<Core::Reporter::PlayReportType::Old>, "SaveReportOld"},
|
||||||
{10101, &PlayReport::SaveReportWithUserOld, "SaveReportWithUserOld"},
|
{10101, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::Old>, "SaveReportWithUserOld"},
|
||||||
{10102, nullptr, "SaveReport"},
|
{10102, &PlayReport::SaveReport<Core::Reporter::PlayReportType::New>, "SaveReport"},
|
||||||
{10103, nullptr, "SaveReportWithUser"},
|
{10103, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::New>, "SaveReportWithUser"},
|
||||||
{10200, nullptr, "RequestImmediateTransmission"},
|
{10200, nullptr, "RequestImmediateTransmission"},
|
||||||
{10300, nullptr, "GetTransmissionStatus"},
|
{10300, nullptr, "GetTransmissionStatus"},
|
||||||
{20100, nullptr, "SaveSystemReport"},
|
{20100, &PlayReport::SaveSystemReport, "SaveSystemReport"},
|
||||||
{20101, nullptr, "SaveSystemReportWithUser"},
|
{20101, &PlayReport::SaveSystemReportWithUser, "SaveSystemReportWithUser"},
|
||||||
{20200, nullptr, "SetOperationMode"},
|
{20200, nullptr, "SetOperationMode"},
|
||||||
{30100, nullptr, "ClearStorage"},
|
{30100, nullptr, "ClearStorage"},
|
||||||
{30200, nullptr, "ClearStatistics"},
|
{30200, nullptr, "ClearStatistics"},
|
||||||
@ -47,7 +44,28 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void SaveReportWithUserOld(Kernel::HLERequestContext& ctx) {
|
template <Core::Reporter::PlayReportType Type>
|
||||||
|
void SaveReport(Kernel::HLERequestContext& ctx) {
|
||||||
|
IPC::RequestParser rp{ctx};
|
||||||
|
const auto process_id = rp.PopRaw<u64>();
|
||||||
|
|
||||||
|
const auto data1 = ctx.ReadBuffer(0);
|
||||||
|
const auto data2 = ctx.ReadBuffer(1);
|
||||||
|
|
||||||
|
LOG_DEBUG(Service_PREPO,
|
||||||
|
"called, type={:02X}, process_id={:016X}, data1_size={:016X}, data2_size={:016X}",
|
||||||
|
static_cast<u8>(Type), process_id, data1.size(), data2.size());
|
||||||
|
|
||||||
|
const auto& reporter{system.GetReporter()};
|
||||||
|
reporter.SavePlayReport(Type, system.CurrentProcess()->GetTitleID(), {data1, data2},
|
||||||
|
process_id);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <Core::Reporter::PlayReportType Type>
|
||||||
|
void SaveReportWithUser(Kernel::HLERequestContext& ctx) {
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
const auto user_id = rp.PopRaw<u128>();
|
const auto user_id = rp.PopRaw<u128>();
|
||||||
const auto process_id = rp.PopRaw<u64>();
|
const auto process_id = rp.PopRaw<u64>();
|
||||||
@ -57,24 +75,65 @@ private:
|
|||||||
|
|
||||||
LOG_DEBUG(
|
LOG_DEBUG(
|
||||||
Service_PREPO,
|
Service_PREPO,
|
||||||
"called, user_id={:016X}{:016X}, unk1={:016X}, data1_size={:016X}, data2_size={:016X}",
|
"called, type={:02X}, user_id={:016X}{:016X}, process_id={:016X}, data1_size={:016X}, "
|
||||||
user_id[1], user_id[0], process_id, data1.size(), data2.size());
|
"data2_size={:016X}",
|
||||||
|
static_cast<u8>(Type), user_id[1], user_id[0], process_id, data1.size(), data2.size());
|
||||||
|
|
||||||
const auto& reporter{Core::System::GetInstance().GetReporter()};
|
const auto& reporter{system.GetReporter()};
|
||||||
reporter.SavePlayReport(Core::CurrentProcess()->GetTitleID(), process_id, {data1, data2},
|
reporter.SavePlayReport(Type, system.CurrentProcess()->GetTitleID(), {data1, data2},
|
||||||
user_id);
|
process_id, user_id);
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SaveSystemReport(Kernel::HLERequestContext& ctx) {
|
||||||
|
IPC::RequestParser rp{ctx};
|
||||||
|
const auto title_id = rp.PopRaw<u64>();
|
||||||
|
|
||||||
|
const auto data1 = ctx.ReadBuffer(0);
|
||||||
|
const auto data2 = ctx.ReadBuffer(1);
|
||||||
|
|
||||||
|
LOG_DEBUG(Service_PREPO, "called, title_id={:016X}, data1_size={:016X}, data2_size={:016X}",
|
||||||
|
title_id, data1.size(), data2.size());
|
||||||
|
|
||||||
|
const auto& reporter{system.GetReporter()};
|
||||||
|
reporter.SavePlayReport(Core::Reporter::PlayReportType::System, title_id, {data1, data2});
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SaveSystemReportWithUser(Kernel::HLERequestContext& ctx) {
|
||||||
|
IPC::RequestParser rp{ctx};
|
||||||
|
const auto user_id = rp.PopRaw<u128>();
|
||||||
|
const auto title_id = rp.PopRaw<u64>();
|
||||||
|
|
||||||
|
const auto data1 = ctx.ReadBuffer(0);
|
||||||
|
const auto data2 = ctx.ReadBuffer(1);
|
||||||
|
|
||||||
|
LOG_DEBUG(Service_PREPO,
|
||||||
|
"called, user_id={:016X}{:016X}, title_id={:016X}, data1_size={:016X}, "
|
||||||
|
"data2_size={:016X}",
|
||||||
|
user_id[1], user_id[0], title_id, data1.size(), data2.size());
|
||||||
|
|
||||||
|
const auto& reporter{system.GetReporter()};
|
||||||
|
reporter.SavePlayReport(Core::Reporter::PlayReportType::System, title_id, {data1, data2},
|
||||||
|
std::nullopt, user_id);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
|
Core::System& system;
|
||||||
};
|
};
|
||||||
|
|
||||||
void InstallInterfaces(SM::ServiceManager& service_manager) {
|
void InstallInterfaces(Core::System& system) {
|
||||||
std::make_shared<PlayReport>("prepo:a")->InstallAsService(service_manager);
|
std::make_shared<PlayReport>(system, "prepo:a")->InstallAsService(system.ServiceManager());
|
||||||
std::make_shared<PlayReport>("prepo:a2")->InstallAsService(service_manager);
|
std::make_shared<PlayReport>(system, "prepo:a2")->InstallAsService(system.ServiceManager());
|
||||||
std::make_shared<PlayReport>("prepo:m")->InstallAsService(service_manager);
|
std::make_shared<PlayReport>(system, "prepo:m")->InstallAsService(system.ServiceManager());
|
||||||
std::make_shared<PlayReport>("prepo:s")->InstallAsService(service_manager);
|
std::make_shared<PlayReport>(system, "prepo:s")->InstallAsService(system.ServiceManager());
|
||||||
std::make_shared<PlayReport>("prepo:u")->InstallAsService(service_manager);
|
std::make_shared<PlayReport>(system, "prepo:u")->InstallAsService(system.ServiceManager());
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Service::PlayReport
|
} // namespace Service::PlayReport
|
||||||
|
@ -10,6 +10,6 @@ class ServiceManager;
|
|||||||
|
|
||||||
namespace Service::PlayReport {
|
namespace Service::PlayReport {
|
||||||
|
|
||||||
void InstallInterfaces(SM::ServiceManager& service_manager);
|
void InstallInterfaces(Core::System& system);
|
||||||
|
|
||||||
} // namespace Service::PlayReport
|
} // namespace Service::PlayReport
|
||||||
|
@ -241,7 +241,7 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system) {
|
|||||||
PCIe::InstallInterfaces(*sm);
|
PCIe::InstallInterfaces(*sm);
|
||||||
PCTL::InstallInterfaces(*sm);
|
PCTL::InstallInterfaces(*sm);
|
||||||
PCV::InstallInterfaces(*sm);
|
PCV::InstallInterfaces(*sm);
|
||||||
PlayReport::InstallInterfaces(*sm);
|
PlayReport::InstallInterfaces(system);
|
||||||
PM::InstallInterfaces(system);
|
PM::InstallInterfaces(system);
|
||||||
PSC::InstallInterfaces(*sm);
|
PSC::InstallInterfaces(*sm);
|
||||||
PSM::InstallInterfaces(*sm);
|
PSM::InstallInterfaces(*sm);
|
||||||
|
@ -304,8 +304,8 @@ void Reporter::SaveUnimplementedAppletReport(
|
|||||||
SaveToFile(std::move(out), GetPath("unimpl_applet_report", title_id, timestamp));
|
SaveToFile(std::move(out), GetPath("unimpl_applet_report", title_id, timestamp));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Reporter::SavePlayReport(u64 title_id, u64 process_id, std::vector<std::vector<u8>> data,
|
void Reporter::SavePlayReport(PlayReportType type, u64 title_id, std::vector<std::vector<u8>> data,
|
||||||
std::optional<u128> user_id) const {
|
std::optional<u64> process_id, std::optional<u128> user_id) const {
|
||||||
if (!IsReportingEnabled()) {
|
if (!IsReportingEnabled()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -321,7 +321,11 @@ void Reporter::SavePlayReport(u64 title_id, u64 process_id, std::vector<std::vec
|
|||||||
data_out.push_back(Common::HexToString(d));
|
data_out.push_back(Common::HexToString(d));
|
||||||
}
|
}
|
||||||
|
|
||||||
out["play_report_process_id"] = fmt::format("{:016X}", process_id);
|
if (process_id.has_value()) {
|
||||||
|
out["play_report_process_id"] = fmt::format("{:016X}", *process_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
out["play_report_type"] = fmt::format("{:02}", static_cast<u8>(type));
|
||||||
out["play_report_data"] = std::move(data_out);
|
out["play_report_data"] = std::move(data_out);
|
||||||
|
|
||||||
SaveToFile(std::move(out), GetPath("play_report", title_id, timestamp));
|
SaveToFile(std::move(out), GetPath("play_report", title_id, timestamp));
|
||||||
|
@ -46,8 +46,14 @@ public:
|
|||||||
std::vector<std::vector<u8>> normal_channel,
|
std::vector<std::vector<u8>> normal_channel,
|
||||||
std::vector<std::vector<u8>> interactive_channel) const;
|
std::vector<std::vector<u8>> interactive_channel) const;
|
||||||
|
|
||||||
void SavePlayReport(u64 title_id, u64 process_id, std::vector<std::vector<u8>> data,
|
enum class PlayReportType {
|
||||||
std::optional<u128> user_id = {}) const;
|
Old,
|
||||||
|
New,
|
||||||
|
System,
|
||||||
|
};
|
||||||
|
|
||||||
|
void SavePlayReport(PlayReportType type, u64 title_id, std::vector<std::vector<u8>> data,
|
||||||
|
std::optional<u64> process_id = {}, std::optional<u128> user_id = {}) const;
|
||||||
|
|
||||||
void SaveErrorReport(u64 title_id, ResultCode result,
|
void SaveErrorReport(u64 title_id, ResultCode result,
|
||||||
std::optional<std::string> custom_text_main = {},
|
std::optional<std::string> custom_text_main = {},
|
||||||
|
Loading…
Reference in New Issue
Block a user