|
@@ -5,22 +5,71 @@
|
|
|
#include <sstream>
|
|
#include <sstream>
|
|
|
#include <string>
|
|
#include <string>
|
|
|
|
|
|
|
|
|
|
+#include <optional>
|
|
|
|
|
+#include <unordered_map>
|
|
|
|
|
+#include <boost/container_hash/hash.hpp>
|
|
|
#include "common/logging/log.h"
|
|
#include "common/logging/log.h"
|
|
|
#include "common/scope_exit.h"
|
|
#include "common/scope_exit.h"
|
|
|
#include "core/core.h"
|
|
#include "core/core.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"
|
|
|
|
|
|
|
|
namespace Service::LM {
|
|
namespace Service::LM {
|
|
|
|
|
+enum class LogSeverity : u8 {
|
|
|
|
|
+ Trace = 0,
|
|
|
|
|
+ Info = 1,
|
|
|
|
|
+ Warning = 2,
|
|
|
|
|
+ Error = 3,
|
|
|
|
|
+ Fatal = 4,
|
|
|
|
|
+};
|
|
|
|
|
+
|
|
|
|
|
+// To keep flags out of hashing as well as the payload size
|
|
|
|
|
+struct LogPacketHeaderEntry {
|
|
|
|
|
+ u64_le pid{};
|
|
|
|
|
+ u64_le tid{};
|
|
|
|
|
+ LogSeverity severity{};
|
|
|
|
|
+ u8 verbosity{};
|
|
|
|
|
+
|
|
|
|
|
+ auto operator<=>(const LogPacketHeaderEntry&) const = default;
|
|
|
|
|
+};
|
|
|
|
|
+} // namespace Service::LM
|
|
|
|
|
+
|
|
|
|
|
+namespace std {
|
|
|
|
|
+template <>
|
|
|
|
|
+struct hash<Service::LM::LogPacketHeaderEntry> {
|
|
|
|
|
+ std::size_t operator()(const Service::LM::LogPacketHeaderEntry& k) const {
|
|
|
|
|
+ std::size_t seed{};
|
|
|
|
|
+ boost::hash_combine(seed, k.pid);
|
|
|
|
|
+ boost::hash_combine(seed, k.tid);
|
|
|
|
|
+ boost::hash_combine(seed, k.severity);
|
|
|
|
|
+ boost::hash_combine(seed, k.verbosity);
|
|
|
|
|
+ return seed;
|
|
|
|
|
+ };
|
|
|
|
|
+};
|
|
|
|
|
+} // namespace std
|
|
|
|
|
+
|
|
|
|
|
+namespace Service::LM {
|
|
|
|
|
+
|
|
|
|
|
+enum class LogDestination : u32 {
|
|
|
|
|
+ TargetManager = 1 << 0,
|
|
|
|
|
+ Uart = 1 << 1,
|
|
|
|
|
+ UartSleep = 1 << 2,
|
|
|
|
|
+ All = 0xffff,
|
|
|
|
|
+};
|
|
|
|
|
+DECLARE_ENUM_FLAG_OPERATORS(LogDestination);
|
|
|
|
|
+
|
|
|
|
|
+enum class LogPacketFlags : u8 {
|
|
|
|
|
+ Head = 1 << 0,
|
|
|
|
|
+ Tail = 1 << 1,
|
|
|
|
|
+ LittleEndian = 1 << 2,
|
|
|
|
|
+};
|
|
|
|
|
+DECLARE_ENUM_FLAG_OPERATORS(LogPacketFlags);
|
|
|
|
|
|
|
|
class ILogger final : public ServiceFramework<ILogger> {
|
|
class ILogger final : public ServiceFramework<ILogger> {
|
|
|
public:
|
|
public:
|
|
|
- explicit ILogger(Core::System& system_)
|
|
|
|
|
- : ServiceFramework{system_, "ILogger"}, manager{system_.GetLogManager()},
|
|
|
|
|
- memory{system_.Memory()} {
|
|
|
|
|
|
|
+ explicit ILogger(Core::System& system_) : ServiceFramework{system_, "ILogger"} {
|
|
|
static const FunctionInfo functions[] = {
|
|
static const FunctionInfo functions[] = {
|
|
|
{0, &ILogger::Log, "Log"},
|
|
{0, &ILogger::Log, "Log"},
|
|
|
{1, &ILogger::SetDestination, "SetDestination"},
|
|
{1, &ILogger::SetDestination, "SetDestination"},
|
|
@@ -30,54 +79,260 @@ public:
|
|
|
|
|
|
|
|
private:
|
|
private:
|
|
|
void Log(Kernel::HLERequestContext& ctx) {
|
|
void Log(Kernel::HLERequestContext& ctx) {
|
|
|
|
|
+ std::size_t offset{};
|
|
|
|
|
+ const auto data = ctx.ReadBuffer();
|
|
|
|
|
+
|
|
|
// This function only succeeds - Get that out of the way
|
|
// This function only succeeds - Get that out of the way
|
|
|
IPC::ResponseBuilder rb{ctx, 2};
|
|
IPC::ResponseBuilder rb{ctx, 2};
|
|
|
rb.Push(RESULT_SUCCESS);
|
|
rb.Push(RESULT_SUCCESS);
|
|
|
|
|
|
|
|
- // Read MessageHeader, despite not doing anything with it right now
|
|
|
|
|
- MessageHeader header{};
|
|
|
|
|
- VAddr addr{ctx.BufferDescriptorX()[0].Address()};
|
|
|
|
|
- const VAddr end_addr{addr + ctx.BufferDescriptorX()[0].size};
|
|
|
|
|
- memory.ReadBlock(addr, &header, sizeof(MessageHeader));
|
|
|
|
|
- addr += sizeof(MessageHeader);
|
|
|
|
|
-
|
|
|
|
|
- FieldMap fields;
|
|
|
|
|
- while (addr < end_addr) {
|
|
|
|
|
- const auto field = static_cast<Field>(memory.Read8(addr++));
|
|
|
|
|
- const auto length = memory.Read8(addr++);
|
|
|
|
|
|
|
+ if (data.size() < sizeof(LogPacketHeader)) {
|
|
|
|
|
+ LOG_ERROR(Service_LM, "Data size is too small for header! size={}", data.size());
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- if (static_cast<Field>(memory.Read8(addr)) == Field::Skip) {
|
|
|
|
|
- ++addr;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ LogPacketHeader header{};
|
|
|
|
|
+ std::memcpy(&header, data.data(), sizeof(LogPacketHeader));
|
|
|
|
|
+ offset += sizeof(LogPacketHeader);
|
|
|
|
|
|
|
|
- SCOPE_EXIT({ addr += length; });
|
|
|
|
|
|
|
+ LogPacketHeaderEntry entry{
|
|
|
|
|
+ .pid = header.pid,
|
|
|
|
|
+ .tid = header.tid,
|
|
|
|
|
+ .severity = header.severity,
|
|
|
|
|
+ .verbosity = header.verbosity,
|
|
|
|
|
+ };
|
|
|
|
|
|
|
|
- if (field == Field::Skip) {
|
|
|
|
|
- continue;
|
|
|
|
|
|
|
+ if (True(header.flags & LogPacketFlags::Head)) {
|
|
|
|
|
+ std::vector<u8> tmp(data.size() - sizeof(LogPacketHeader));
|
|
|
|
|
+ std::memcpy(tmp.data(), data.data() + offset, tmp.size());
|
|
|
|
|
+ entries[entry] = std::move(tmp);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ // Append to existing entry
|
|
|
|
|
+ if (!entries.contains(entry)) {
|
|
|
|
|
+ LOG_ERROR(Service_LM, "Log entry does not exist!");
|
|
|
|
|
+ return;
|
|
|
}
|
|
}
|
|
|
|
|
+ std::vector<u8> tmp(data.size() - sizeof(LogPacketHeader));
|
|
|
|
|
|
|
|
- std::vector<u8> data(length);
|
|
|
|
|
- memory.ReadBlock(addr, data.data(), length);
|
|
|
|
|
- fields.emplace(field, std::move(data));
|
|
|
|
|
|
|
+ auto& existing_entry = entries[entry];
|
|
|
|
|
+ const auto base = existing_entry.size();
|
|
|
|
|
+ existing_entry.resize(base + (data.size() - sizeof(LogPacketHeader)));
|
|
|
|
|
+ std::memcpy(existing_entry.data() + base, data.data() + offset,
|
|
|
|
|
+ (data.size() - sizeof(LogPacketHeader)));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- manager.Log({header, std::move(fields)});
|
|
|
|
|
|
|
+ if (True(header.flags & LogPacketFlags::Tail)) {
|
|
|
|
|
+ auto it = entries.find(entry);
|
|
|
|
|
+ if (it == entries.end()) {
|
|
|
|
|
+ LOG_ERROR(Service_LM, "Log entry does not exist!");
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ ParseLog(it->first, it->second);
|
|
|
|
|
+ entries.erase(it);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void SetDestination(Kernel::HLERequestContext& ctx) {
|
|
void SetDestination(Kernel::HLERequestContext& ctx) {
|
|
|
IPC::RequestParser rp{ctx};
|
|
IPC::RequestParser rp{ctx};
|
|
|
- const auto destination = rp.PopEnum<DestinationFlag>();
|
|
|
|
|
-
|
|
|
|
|
- LOG_DEBUG(Service_LM, "called, destination={:08X}", destination);
|
|
|
|
|
|
|
+ const auto log_destination = rp.PopEnum<LogDestination>();
|
|
|
|
|
|
|
|
- manager.SetDestination(destination);
|
|
|
|
|
|
|
+ LOG_DEBUG(Service_LM, "called, destination={}", DestinationToString(log_destination));
|
|
|
|
|
+ destination = log_destination;
|
|
|
|
|
|
|
|
IPC::ResponseBuilder rb{ctx, 2};
|
|
IPC::ResponseBuilder rb{ctx, 2};
|
|
|
rb.Push(RESULT_SUCCESS);
|
|
rb.Push(RESULT_SUCCESS);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- Manager& manager;
|
|
|
|
|
- Core::Memory::Memory& memory;
|
|
|
|
|
|
|
+ u32 ReadLeb128(const std::vector<u8>& data, std::size_t& offset) {
|
|
|
|
|
+ u32 result{};
|
|
|
|
|
+ u32 shift{};
|
|
|
|
|
+ do {
|
|
|
|
|
+ result |= (data[offset] & 0x7f) << shift;
|
|
|
|
|
+ shift += 7;
|
|
|
|
|
+ offset++;
|
|
|
|
|
+ if (offset >= data.size()) {
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ } while ((data[offset] & 0x80) != 0);
|
|
|
|
|
+ return result;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ std::optional<std::string> ReadString(const std::vector<u8>& data, std::size_t& offset,
|
|
|
|
|
+ std::size_t length) {
|
|
|
|
|
+ if (length == 0) {
|
|
|
|
|
+ return std::nullopt;
|
|
|
|
|
+ }
|
|
|
|
|
+ std::string output(length, '\0');
|
|
|
|
|
+ std::memcpy(output.data(), data.data() + offset, length);
|
|
|
|
|
+ offset += length;
|
|
|
|
|
+ return output;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ u32_le ReadAsU32(const std::vector<u8>& data, std::size_t& offset, std::size_t length) {
|
|
|
|
|
+ ASSERT(length == sizeof(u32));
|
|
|
|
|
+ u32_le output{};
|
|
|
|
|
+ std::memcpy(&output, data.data() + offset, sizeof(u32));
|
|
|
|
|
+ offset += length;
|
|
|
|
|
+ return output;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ u64_le ReadAsU64(const std::vector<u8>& data, std::size_t& offset, std::size_t length) {
|
|
|
|
|
+ ASSERT(length == sizeof(u64));
|
|
|
|
|
+ u64_le output{};
|
|
|
|
|
+ std::memcpy(&output, data.data() + offset, sizeof(u64));
|
|
|
|
|
+ offset += length;
|
|
|
|
|
+ return output;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ void ParseLog(const LogPacketHeaderEntry entry, const std::vector<u8>& log_data) {
|
|
|
|
|
+ // Possible entries
|
|
|
|
|
+ std::optional<std::string> text_log;
|
|
|
|
|
+ std::optional<u32> line_number;
|
|
|
|
|
+ std::optional<std::string> file_name;
|
|
|
|
|
+ std::optional<std::string> function_name;
|
|
|
|
|
+ std::optional<std::string> module_name;
|
|
|
|
|
+ std::optional<std::string> thread_name;
|
|
|
|
|
+ std::optional<u64> log_pack_drop_count;
|
|
|
|
|
+ std::optional<s64> user_system_clock;
|
|
|
|
|
+ std::optional<std::string> process_name;
|
|
|
|
|
+
|
|
|
|
|
+ std::size_t offset{};
|
|
|
|
|
+ while (offset < log_data.size()) {
|
|
|
|
|
+ const auto key = static_cast<LogDataChunkKey>(ReadLeb128(log_data, offset));
|
|
|
|
|
+ const auto chunk_size = ReadLeb128(log_data, offset);
|
|
|
|
|
+
|
|
|
|
|
+ switch (key) {
|
|
|
|
|
+ case LogDataChunkKey::LogSessionBegin:
|
|
|
|
|
+ case LogDataChunkKey::LogSessionEnd:
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogDataChunkKey::TextLog:
|
|
|
|
|
+ text_log = ReadString(log_data, offset, chunk_size);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogDataChunkKey::LineNumber:
|
|
|
|
|
+ line_number = ReadAsU32(log_data, offset, chunk_size);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogDataChunkKey::FileName:
|
|
|
|
|
+ file_name = ReadString(log_data, offset, chunk_size);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogDataChunkKey::FunctionName:
|
|
|
|
|
+ function_name = ReadString(log_data, offset, chunk_size);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogDataChunkKey::ModuleName:
|
|
|
|
|
+ module_name = ReadString(log_data, offset, chunk_size);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogDataChunkKey::ThreadName:
|
|
|
|
|
+ thread_name = ReadString(log_data, offset, chunk_size);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogDataChunkKey::LogPacketDropCount:
|
|
|
|
|
+ log_pack_drop_count = ReadAsU64(log_data, offset, chunk_size);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogDataChunkKey::UserSystemClock:
|
|
|
|
|
+ user_system_clock = ReadAsU64(log_data, offset, chunk_size);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogDataChunkKey::ProcessName:
|
|
|
|
|
+ process_name = ReadString(log_data, offset, chunk_size);
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ std::string output_log{};
|
|
|
|
|
+ if (process_name) {
|
|
|
|
|
+ output_log += fmt::format("Process: {}\n", *process_name);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (module_name) {
|
|
|
|
|
+ output_log += fmt::format("Module: {}\n", *module_name);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (file_name) {
|
|
|
|
|
+ output_log += fmt::format("File: {}\n", *file_name);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (function_name) {
|
|
|
|
|
+ output_log += fmt::format("Function: {}\n", *function_name);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (line_number && *line_number != 0) {
|
|
|
|
|
+ output_log += fmt::format("Line: {}\n", *line_number);
|
|
|
|
|
+ }
|
|
|
|
|
+ output_log += fmt::format("ProcessID: {}\n", entry.pid);
|
|
|
|
|
+ output_log += fmt::format("ThreadID: {}\n", entry.tid);
|
|
|
|
|
+
|
|
|
|
|
+ if (text_log) {
|
|
|
|
|
+ output_log += fmt::format("Log Text: {}\n", *text_log);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ switch (entry.severity) {
|
|
|
|
|
+ case LogSeverity::Trace:
|
|
|
|
|
+ LOG_DEBUG(Service_LM, "LogManager DEBUG ({}):\n{}", DestinationToString(destination),
|
|
|
|
|
+ output_log);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogSeverity::Info:
|
|
|
|
|
+ LOG_INFO(Service_LM, "LogManager INFO ({}):\n{}", DestinationToString(destination),
|
|
|
|
|
+ output_log);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogSeverity::Warning:
|
|
|
|
|
+ LOG_WARNING(Service_LM, "LogManager WARNING ({}):\n{}",
|
|
|
|
|
+ DestinationToString(destination), output_log);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogSeverity::Error:
|
|
|
|
|
+ LOG_ERROR(Service_LM, "LogManager ERROR ({}):\n{}", DestinationToString(destination),
|
|
|
|
|
+ output_log);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case LogSeverity::Fatal:
|
|
|
|
|
+ LOG_CRITICAL(Service_LM, "LogManager FATAL ({}):\n{}", DestinationToString(destination),
|
|
|
|
|
+ output_log);
|
|
|
|
|
+ break;
|
|
|
|
|
+ default:
|
|
|
|
|
+ LOG_CRITICAL(Service_LM, "LogManager UNKNOWN ({}):\n{}",
|
|
|
|
|
+ DestinationToString(destination), output_log);
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ std::string DestinationToString(LogDestination destination) {
|
|
|
|
|
+ if (True(destination & LogDestination::All)) {
|
|
|
|
|
+ return "TargetManager | Uart | UartSleep";
|
|
|
|
|
+ }
|
|
|
|
|
+ std::string output{};
|
|
|
|
|
+ if (True(destination & LogDestination::TargetManager)) {
|
|
|
|
|
+ output += "| TargetManager";
|
|
|
|
|
+ }
|
|
|
|
|
+ if (True(destination & LogDestination::Uart)) {
|
|
|
|
|
+ output += "| Uart";
|
|
|
|
|
+ }
|
|
|
|
|
+ if (True(destination & LogDestination::UartSleep)) {
|
|
|
|
|
+ output += "| UartSleep";
|
|
|
|
|
+ }
|
|
|
|
|
+ if (output.length() > 0) {
|
|
|
|
|
+ return output.substr(2);
|
|
|
|
|
+ }
|
|
|
|
|
+ return "No Destination";
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ enum class LogDataChunkKey : u32 {
|
|
|
|
|
+ LogSessionBegin = 0,
|
|
|
|
|
+ LogSessionEnd = 1,
|
|
|
|
|
+ TextLog = 2,
|
|
|
|
|
+ LineNumber = 3,
|
|
|
|
|
+ FileName = 4,
|
|
|
|
|
+ FunctionName = 5,
|
|
|
|
|
+ ModuleName = 6,
|
|
|
|
|
+ ThreadName = 7,
|
|
|
|
|
+ LogPacketDropCount = 8,
|
|
|
|
|
+ UserSystemClock = 9,
|
|
|
|
|
+ ProcessName = 10,
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ struct LogPacketHeader {
|
|
|
|
|
+ u64_le pid{};
|
|
|
|
|
+ u64_le tid{};
|
|
|
|
|
+ LogPacketFlags flags{};
|
|
|
|
|
+ INSERT_PADDING_BYTES(1);
|
|
|
|
|
+ LogSeverity severity{};
|
|
|
|
|
+ u8 verbosity{};
|
|
|
|
|
+ u32_le payload_size{};
|
|
|
|
|
+ };
|
|
|
|
|
+ static_assert(sizeof(LogPacketHeader) == 0x18, "LogPacketHeader is an invalid size");
|
|
|
|
|
+
|
|
|
|
|
+ std::unordered_map<LogPacketHeaderEntry, std::vector<u8>> entries{};
|
|
|
|
|
+ LogDestination destination{LogDestination::All};
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
class LM final : public ServiceFramework<LM> {
|
|
class LM final : public ServiceFramework<LM> {
|