From 787b191abf8789d18c829ab7e7135bb6e3fcc680 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Wed, 26 Jun 2019 18:02:19 -0400 Subject: [PATCH 1/3] reporter: Differentiate between Old, New, and System play reports --- src/core/reporter.cpp | 10 +++++++--- src/core/reporter.h | 10 ++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index cfe0771e2..9c657929e 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -304,8 +304,8 @@ void Reporter::SaveUnimplementedAppletReport( SaveToFile(std::move(out), GetPath("unimpl_applet_report", title_id, timestamp)); } -void Reporter::SavePlayReport(u64 title_id, u64 process_id, std::vector> data, - std::optional user_id) const { +void Reporter::SavePlayReport(PlayReportType type, u64 title_id, std::vector> data, + std::optional process_id, std::optional user_id) const { if (!IsReportingEnabled()) { return; } @@ -321,7 +321,11 @@ void Reporter::SavePlayReport(u64 title_id, u64 process_id, std::vector(type)); out["play_report_data"] = std::move(data_out); SaveToFile(std::move(out), GetPath("play_report", title_id, timestamp)); diff --git a/src/core/reporter.h b/src/core/reporter.h index 44256de50..f08aa11fb 100644 --- a/src/core/reporter.h +++ b/src/core/reporter.h @@ -46,8 +46,14 @@ public: std::vector> normal_channel, std::vector> interactive_channel) const; - void SavePlayReport(u64 title_id, u64 process_id, std::vector> data, - std::optional user_id = {}) const; + enum class PlayReportType { + Old, + New, + System, + }; + + void SavePlayReport(PlayReportType type, u64 title_id, std::vector> data, + std::optional process_id = {}, std::optional user_id = {}) const; void SaveErrorReport(u64 title_id, ResultCode result, std::optional custom_text_main = {}, From daf9cd9358cee49fe5a876469da529cd3660a618 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Wed, 26 Jun 2019 18:02:36 -0400 Subject: [PATCH 2/3] prepo: Implement SaveReport New and System variants --- src/core/hle/service/prepo/prepo.cpp | 86 +++++++++++++++++++++++----- 1 file changed, 71 insertions(+), 15 deletions(-) diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index 7e134f5c1..d56ce0eb9 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -2,18 +2,14 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include -#include "common/file_util.h" #include "common/hex_util.h" #include "common/logging/log.h" -#include "common/scm_rev.h" #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/process.h" #include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/prepo/prepo.h" #include "core/hle/service/service.h" #include "core/reporter.h" -#include "core/settings.h" namespace Service::PlayReport { @@ -22,14 +18,14 @@ public: explicit PlayReport(const char* name) : ServiceFramework{name} { // clang-format off static const FunctionInfo functions[] = { - {10100, nullptr, "SaveReportOld"}, - {10101, &PlayReport::SaveReportWithUserOld, "SaveReportWithUserOld"}, - {10102, nullptr, "SaveReport"}, - {10103, nullptr, "SaveReportWithUser"}, + {10100, &PlayReport::SaveReport, "SaveReportOld"}, + {10101, &PlayReport::SaveReportWithUser, "SaveReportWithUserOld"}, + {10102, &PlayReport::SaveReport, "SaveReport"}, + {10103, &PlayReport::SaveReportWithUser, "SaveReportWithUser"}, {10200, nullptr, "RequestImmediateTransmission"}, {10300, nullptr, "GetTransmissionStatus"}, - {20100, nullptr, "SaveSystemReport"}, - {20101, nullptr, "SaveSystemReportWithUser"}, + {20100, &PlayReport::SaveSystemReport, "SaveSystemReport"}, + {20101, &PlayReport::SaveSystemReportWithUser, "SaveSystemReportWithUser"}, {20200, nullptr, "SetOperationMode"}, {30100, nullptr, "ClearStorage"}, {30200, nullptr, "ClearStatistics"}, @@ -47,7 +43,28 @@ public: } private: - void SaveReportWithUserOld(Kernel::HLERequestContext& ctx) { + template + void SaveReport(Kernel::HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto process_id = rp.PopRaw(); + + 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(Type), process_id, data1.size(), data2.size()); + + const auto& reporter{Core::System::GetInstance().GetReporter()}; + reporter.SavePlayReport(Type, Core::CurrentProcess()->GetTitleID(), {data1, data2}, + process_id); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + } + + template + void SaveReportWithUser(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto user_id = rp.PopRaw(); const auto process_id = rp.PopRaw(); @@ -57,12 +74,51 @@ private: LOG_DEBUG( Service_PREPO, - "called, user_id={:016X}{:016X}, unk1={:016X}, data1_size={:016X}, data2_size={:016X}", - user_id[1], user_id[0], process_id, data1.size(), data2.size()); + "called, type={:02X}, user_id={:016X}{:016X}, process_id={:016X}, data1_size={:016X}, " + "data2_size={:016X}", + static_cast(Type), user_id[1], user_id[0], process_id, data1.size(), data2.size()); const auto& reporter{Core::System::GetInstance().GetReporter()}; - reporter.SavePlayReport(Core::CurrentProcess()->GetTitleID(), process_id, {data1, data2}, - user_id); + reporter.SavePlayReport(Type, Core::CurrentProcess()->GetTitleID(), {data1, data2}, + process_id, user_id); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + } + + void SaveSystemReport(Kernel::HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto title_id = rp.PopRaw(); + + 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{Core::System::GetInstance().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(); + const auto title_id = rp.PopRaw(); + + 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{Core::System::GetInstance().GetReporter()}; + reporter.SavePlayReport(Core::Reporter::PlayReportType::System, title_id, {data1, data2}, + std::nullopt, user_id); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); From 8dd2e914272da5e347da0921bad2829cbc596c92 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sat, 21 Sep 2019 19:14:15 -0400 Subject: [PATCH 3/3] prepo: Remove system global accessors --- src/core/hle/service/prepo/prepo.cpp | 29 +++++++++++++++------------- src/core/hle/service/prepo/prepo.h | 2 +- src/core/hle/service/service.cpp | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index d56ce0eb9..0f79135ff 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -15,7 +15,8 @@ namespace Service::PlayReport { class PlayReport final : public ServiceFramework { public: - explicit PlayReport(const char* name) : ServiceFramework{name} { + explicit PlayReport(Core::System& system, const char* name) + : ServiceFramework{name}, system(system) { // clang-format off static const FunctionInfo functions[] = { {10100, &PlayReport::SaveReport, "SaveReportOld"}, @@ -55,8 +56,8 @@ private: "called, type={:02X}, process_id={:016X}, data1_size={:016X}, data2_size={:016X}", static_cast(Type), process_id, data1.size(), data2.size()); - const auto& reporter{Core::System::GetInstance().GetReporter()}; - reporter.SavePlayReport(Type, Core::CurrentProcess()->GetTitleID(), {data1, data2}, + const auto& reporter{system.GetReporter()}; + reporter.SavePlayReport(Type, system.CurrentProcess()->GetTitleID(), {data1, data2}, process_id); IPC::ResponseBuilder rb{ctx, 2}; @@ -78,8 +79,8 @@ private: "data2_size={:016X}", static_cast(Type), user_id[1], user_id[0], process_id, data1.size(), data2.size()); - const auto& reporter{Core::System::GetInstance().GetReporter()}; - reporter.SavePlayReport(Type, Core::CurrentProcess()->GetTitleID(), {data1, data2}, + const auto& reporter{system.GetReporter()}; + reporter.SavePlayReport(Type, system.CurrentProcess()->GetTitleID(), {data1, data2}, process_id, user_id); IPC::ResponseBuilder rb{ctx, 2}; @@ -96,7 +97,7 @@ private: LOG_DEBUG(Service_PREPO, "called, title_id={:016X}, data1_size={:016X}, data2_size={:016X}", title_id, data1.size(), data2.size()); - const auto& reporter{Core::System::GetInstance().GetReporter()}; + const auto& reporter{system.GetReporter()}; reporter.SavePlayReport(Core::Reporter::PlayReportType::System, title_id, {data1, data2}); IPC::ResponseBuilder rb{ctx, 2}; @@ -116,21 +117,23 @@ private: "data2_size={:016X}", user_id[1], user_id[0], title_id, data1.size(), data2.size()); - const auto& reporter{Core::System::GetInstance().GetReporter()}; + 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) { - std::make_shared("prepo:a")->InstallAsService(service_manager); - std::make_shared("prepo:a2")->InstallAsService(service_manager); - std::make_shared("prepo:m")->InstallAsService(service_manager); - std::make_shared("prepo:s")->InstallAsService(service_manager); - std::make_shared("prepo:u")->InstallAsService(service_manager); +void InstallInterfaces(Core::System& system) { + std::make_shared(system, "prepo:a")->InstallAsService(system.ServiceManager()); + std::make_shared(system, "prepo:a2")->InstallAsService(system.ServiceManager()); + std::make_shared(system, "prepo:m")->InstallAsService(system.ServiceManager()); + std::make_shared(system, "prepo:s")->InstallAsService(system.ServiceManager()); + std::make_shared(system, "prepo:u")->InstallAsService(system.ServiceManager()); } } // namespace Service::PlayReport diff --git a/src/core/hle/service/prepo/prepo.h b/src/core/hle/service/prepo/prepo.h index 0e7b01331..0ebc3a938 100644 --- a/src/core/hle/service/prepo/prepo.h +++ b/src/core/hle/service/prepo/prepo.h @@ -10,6 +10,6 @@ class ServiceManager; namespace Service::PlayReport { -void InstallInterfaces(SM::ServiceManager& service_manager); +void InstallInterfaces(Core::System& system); } // namespace Service::PlayReport diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 3a0f8c3f6..59cdcf165 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -240,7 +240,7 @@ void Init(std::shared_ptr& sm, Core::System& system) { PCIe::InstallInterfaces(*sm); PCTL::InstallInterfaces(*sm); PCV::InstallInterfaces(*sm); - PlayReport::InstallInterfaces(*sm); + PlayReport::InstallInterfaces(system); PM::InstallInterfaces(system); PSC::InstallInterfaces(*sm); PSM::InstallInterfaces(*sm);