summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-08-16 00:53:47 +0200
committerGitHub <noreply@github.com>2018-08-16 00:53:47 +0200
commitc00b374e78756d621b5b9d33eeedf624f23457c3 (patch)
treee5ec96326c0041c4b5b1afa6ce9b2813afeae3bb
parentMerge pull request #1079 from lioncash/fmt (diff)
parentlm: Use LOG_DEBUG for printing out trace logs (diff)
downloadyuzu-c00b374e78756d621b5b9d33eeedf624f23457c3.tar
yuzu-c00b374e78756d621b5b9d33eeedf624f23457c3.tar.gz
yuzu-c00b374e78756d621b5b9d33eeedf624f23457c3.tar.bz2
yuzu-c00b374e78756d621b5b9d33eeedf624f23457c3.tar.lz
yuzu-c00b374e78756d621b5b9d33eeedf624f23457c3.tar.xz
yuzu-c00b374e78756d621b5b9d33eeedf624f23457c3.tar.zst
yuzu-c00b374e78756d621b5b9d33eeedf624f23457c3.zip
-rw-r--r--src/core/hle/service/lm/lm.cpp22
1 files changed, 20 insertions, 2 deletions
diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp
index 2e99ddf51..098da2a41 100644
--- a/src/core/hle/service/lm/lm.cpp
+++ b/src/core/hle/service/lm/lm.cpp
@@ -92,7 +92,11 @@ private:
// Parse out log metadata
u32 line{};
- std::string message, filename, function;
+ std::string module;
+ std::string message;
+ std::string filename;
+ std::string function;
+ std::string thread;
while (addr < end_addr) {
const Field field{static_cast<Field>(Memory::Read8(addr++))};
const size_t length{Memory::Read8(addr++)};
@@ -102,6 +106,8 @@ private:
}
switch (field) {
+ case Field::Skip:
+ break;
case Field::Message:
message = Memory::ReadCString(addr, length);
break;
@@ -114,6 +120,12 @@ private:
case Field::Function:
function = Memory::ReadCString(addr, length);
break;
+ case Field::Module:
+ module = Memory::ReadCString(addr, length);
+ break;
+ case Field::Thread:
+ thread = Memory::ReadCString(addr, length);
+ break;
}
addr += length;
@@ -128,12 +140,18 @@ private:
if (!filename.empty()) {
log_stream << filename << ':';
}
+ if (!module.empty()) {
+ log_stream << module << ':';
+ }
if (!function.empty()) {
log_stream << function << ':';
}
if (line) {
log_stream << std::to_string(line) << ':';
}
+ if (!thread.empty()) {
+ log_stream << thread << ':';
+ }
if (log_stream.str().length() > 0 && log_stream.str().back() == ':') {
log_stream << ' ';
}
@@ -142,7 +160,7 @@ private:
if (header.IsTailLog()) {
switch (header.severity) {
case MessageHeader::Severity::Trace:
- LOG_TRACE(Debug_Emulated, "{}", log_stream.str());
+ LOG_DEBUG(Debug_Emulated, "{}", log_stream.str());
break;
case MessageHeader::Severity::Info:
LOG_INFO(Debug_Emulated, "{}", log_stream.str());