From 5ddc9cede5bc286f4be54c4510ed36f88e0d2756 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Mon, 25 Mar 2019 20:31:16 -0400 Subject: yuzu_tester: Add 'yuzutest' service --- src/yuzu_tester/service/yuzutest.cpp | 104 +++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 src/yuzu_tester/service/yuzutest.cpp (limited to 'src/yuzu_tester/service/yuzutest.cpp') diff --git a/src/yuzu_tester/service/yuzutest.cpp b/src/yuzu_tester/service/yuzutest.cpp new file mode 100644 index 000000000..026582027 --- /dev/null +++ b/src/yuzu_tester/service/yuzutest.cpp @@ -0,0 +1,104 @@ +// Copyright 2019 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include +#include "common/string_util.h" +#include "core/hle/ipc_helpers.h" +#include "core/hle/service/service.h" +#include "core/hle/service/sm/sm.h" +#include "yuzu_tester/service/yuzutest.h" + +namespace Service::Yuzu { + +constexpr u64 SERVICE_VERSION = 1; + +class YuzuTest final : public ServiceFramework { +public: + explicit YuzuTest(std::string data, std::function finish_callback) + : ServiceFramework{"yuzutest"}, data(std::move(data)), + finish_callback(std::move(finish_callback)) { + static const FunctionInfo functions[] = { + {0, &YuzuTest::Initialize, "Initialize"}, + {1, &YuzuTest::GetServiceVersion, "GetServiceVersion"}, + {2, &YuzuTest::GetData, "GetData"}, + {3, &YuzuTest::SetResultCode, "SetResultCode"}, + {4, &YuzuTest::SetResultData, "SetResultData"}, + {5, &YuzuTest::Finish, "Finish"}, + }; + + RegisterHandlers(functions); + } + +private: + void Initialize(Kernel::HLERequestContext& ctx) { + LOG_DEBUG(Frontend, "called"); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + } + + void GetServiceVersion(Kernel::HLERequestContext& ctx) { + LOG_DEBUG(Frontend, "called"); + IPC::ResponseBuilder rb{ctx, 4}; + rb.Push(RESULT_SUCCESS); + rb.Push(SERVICE_VERSION); + } + + void GetData(Kernel::HLERequestContext& ctx) { + LOG_DEBUG(Frontend, "called"); + const auto size = ctx.GetWriteBufferSize(); + const auto write_size = std::min(size, data.size()); + ctx.WriteBuffer(data.data(), write_size); + + IPC::ResponseBuilder rb{ctx, 3}; + rb.Push(RESULT_SUCCESS); + rb.Push(write_size); + } + + void SetResultCode(Kernel::HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto code = rp.PopRaw(); + + LOG_INFO(Frontend, "called with result_code={:08X}", code); + result_code = code; + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + } + + void SetResultData(Kernel::HLERequestContext& ctx) { + IPC::RequestParser rp{ctx}; + const auto buffer = ctx.ReadBuffer(); + std::string data = Common::StringFromFixedZeroTerminatedBuffer( + reinterpret_cast(buffer.data()), buffer.size()); + + LOG_INFO(Frontend, "called with string={}", data); + result_string = data; + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + } + + void Finish(Kernel::HLERequestContext& ctx) { + LOG_DEBUG(Frontend, "called"); + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + + finish_callback(result_code, result_string); + } + + std::string data; + + u32 result_code = 0; + std::string result_string; + + std::function finish_callback; +}; + +void InstallInterfaces(SM::ServiceManager& sm, std::string data, + std::function finish_callback) { + std::make_shared(data, finish_callback)->InstallAsService(sm); +} + +} // namespace Service::Yuzu -- cgit v1.2.3 From f279e792b7c23a9fabce7c56c53c01fcf4e87547 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Thu, 4 Apr 2019 18:05:57 -0400 Subject: yuzutest: Support multiple tests per executable --- src/yuzu_tester/service/yuzutest.cpp | 51 +++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 24 deletions(-) (limited to 'src/yuzu_tester/service/yuzutest.cpp') diff --git a/src/yuzu_tester/service/yuzutest.cpp b/src/yuzu_tester/service/yuzutest.cpp index 026582027..c25ab4aba 100644 --- a/src/yuzu_tester/service/yuzutest.cpp +++ b/src/yuzu_tester/service/yuzutest.cpp @@ -11,20 +11,21 @@ namespace Service::Yuzu { -constexpr u64 SERVICE_VERSION = 1; +constexpr u64 SERVICE_VERSION = 0x00000002; class YuzuTest final : public ServiceFramework { public: - explicit YuzuTest(std::string data, std::function finish_callback) + explicit YuzuTest(std::string data, + std::function)> finish_callback) : ServiceFramework{"yuzutest"}, data(std::move(data)), finish_callback(std::move(finish_callback)) { static const FunctionInfo functions[] = { {0, &YuzuTest::Initialize, "Initialize"}, {1, &YuzuTest::GetServiceVersion, "GetServiceVersion"}, {2, &YuzuTest::GetData, "GetData"}, - {3, &YuzuTest::SetResultCode, "SetResultCode"}, - {4, &YuzuTest::SetResultData, "SetResultData"}, - {5, &YuzuTest::Finish, "Finish"}, + {10, &YuzuTest::StartIndividual, "StartIndividual"}, + {20, &YuzuTest::FinishIndividual, "FinishIndividual"}, + {100, &YuzuTest::ExitProgram, "ExitProgram"}, }; RegisterHandlers(functions); @@ -55,49 +56,51 @@ private: rb.Push(write_size); } - void SetResultCode(Kernel::HLERequestContext& ctx) { - IPC::RequestParser rp{ctx}; - const auto code = rp.PopRaw(); - - LOG_INFO(Frontend, "called with result_code={:08X}", code); - result_code = code; + void StartIndividual(Kernel::HLERequestContext& ctx) { + LOG_DEBUG(Frontend, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); } - void SetResultData(Kernel::HLERequestContext& ctx) { + void FinishIndividual(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; - const auto buffer = ctx.ReadBuffer(); - std::string data = Common::StringFromFixedZeroTerminatedBuffer( - reinterpret_cast(buffer.data()), buffer.size()); - LOG_INFO(Frontend, "called with string={}", data); - result_string = data; + const auto code = rp.PopRaw(); + + const auto result_data_raw = ctx.ReadBuffer(); + const auto test_name_raw = ctx.ReadBuffer(1); + + const auto data = Common::StringFromFixedZeroTerminatedBuffer( + reinterpret_cast(result_data_raw.data()), result_data_raw.size()); + const auto test_name = Common::StringFromFixedZeroTerminatedBuffer( + reinterpret_cast(test_name_raw.data()), test_name_raw.size()); + + LOG_INFO(Frontend, "called, result_code={:08X}, data={}, name={}", code, data, test_name); + + results.push_back({code, data, test_name}); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); } - void Finish(Kernel::HLERequestContext& ctx) { + void ExitProgram(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Frontend, "called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); - finish_callback(result_code, result_string); + finish_callback(results); } std::string data; - u32 result_code = 0; - std::string result_string; - - std::function finish_callback; + std::vector results; + std::function)> finish_callback; }; void InstallInterfaces(SM::ServiceManager& sm, std::string data, - std::function finish_callback) { + std::function)> finish_callback) { std::make_shared(data, finish_callback)->InstallAsService(sm); } -- cgit v1.2.3 From 511bf3435d698662f4f95fbd4722c9a6052680f8 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sun, 26 May 2019 13:59:48 -0400 Subject: yuzu_tester: Display results in table format --- src/yuzu_tester/service/yuzutest.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/yuzu_tester/service/yuzutest.cpp') diff --git a/src/yuzu_tester/service/yuzutest.cpp b/src/yuzu_tester/service/yuzutest.cpp index c25ab4aba..a5e5bddb2 100644 --- a/src/yuzu_tester/service/yuzutest.cpp +++ b/src/yuzu_tester/service/yuzutest.cpp @@ -57,7 +57,12 @@ private: } void StartIndividual(Kernel::HLERequestContext& ctx) { - LOG_DEBUG(Frontend, "called"); + const auto name_raw = ctx.ReadBuffer(); + + const auto name = Common::StringFromFixedZeroTerminatedBuffer( + reinterpret_cast(name_raw.data()), name_raw.size()); + + LOG_DEBUG(Frontend, "called, name={}", name); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); -- cgit v1.2.3 From 3a26b49c2cfb50f312bca63b897480c10bc6329c Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Mon, 10 Jun 2019 00:31:49 -0400 Subject: yuzutest: Add minor comments --- src/yuzu_tester/service/yuzutest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/yuzu_tester/service/yuzutest.cpp') diff --git a/src/yuzu_tester/service/yuzutest.cpp b/src/yuzu_tester/service/yuzutest.cpp index a5e5bddb2..85d3f436b 100644 --- a/src/yuzu_tester/service/yuzutest.cpp +++ b/src/yuzu_tester/service/yuzutest.cpp @@ -95,7 +95,7 @@ private: IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); - finish_callback(results); + finish_callback(std::move(results)); } std::string data; -- cgit v1.2.3