OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-26 06:40:05 +00:00
Code Issues Projects Releases Wiki Activity

Common/Log: get rid repeated log entries

Browse Source
This commit is contained in:
mailwl 2017-02-28 16:30:09 +03:00
parent ad4097e75c
commit d267880198
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/logging/backend.cpp
View File

@ -147,6 +147,15 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned
Entry entry = CreateEntry(log_class, log_level, filename, line_nr, function, format, args); Entry entry = CreateEntry(log_class, log_level, filename, line_nr, function, format, args);
va_end(args); va_end(args);
static Entry prev_entry{};
if (entry == prev_entry) {
prev_entry.count++;
prev_entry.timestamp = entry.timestamp;
return;
}
if (prev_entry.count != 0)
PrintColoredMessage(prev_entry);
PrintColoredMessage(entry); PrintColoredMessage(entry);
prev_entry = std::move(entry);
} }
} } // namespace Log

9
src/common/logging/backend.h
View File

@ -7,7 +7,6 @@
#include <chrono> #include <chrono>
#include <cstdarg> #include <cstdarg>
#include <string> #include <string>
#include <utility>
#include "common/logging/log.h" #include "common/logging/log.h"
namespace Log { namespace Log {
@ -24,6 +23,7 @@ struct Entry {
Level log_level; Level log_level;
std::string location; std::string location;
std::string message; std::string message;
u32 count{0};
Entry() = default; Entry() = default;
Entry(Entry&& o) = default; Entry(Entry&& o) = default;
@ -31,6 +31,11 @@ struct Entry {
Entry& operator=(Entry&& o) = default; Entry& operator=(Entry&& o) = default;
}; };
inline bool operator==(const Entry& lhs, const Entry& rhs) {
return (lhs.log_class == rhs.log_class) && (lhs.log_level == rhs.log_level) &&
(lhs.location == rhs.location) && (lhs.message == rhs.message);
}
/** /**
* Returns the name of the passed log class as a C-string. Subclasses are separated by periods * Returns the name of the passed log class as a C-string. Subclasses are separated by periods
* instead of underscores as in the enumeration. * instead of underscores as in the enumeration.
@ -47,4 +52,4 @@ Entry CreateEntry(Class log_class, Level log_level, const char* filename, unsign
const char* function, const char* format, va_list args); const char* function, const char* format, va_list args);
void SetFilter(Filter* filter); void SetFilter(Filter* filter);
} } // namespace Log

9
src/common/logging/text_formatter.cpp
View File

@ -49,8 +49,15 @@ void FormatLogMessage(const Entry& entry, char* out_text, size_t text_len) {
const char* class_name = GetLogClassName(entry.log_class); const char* class_name = GetLogClassName(entry.log_class);
const char* level_name = GetLevelName(entry.log_level); const char* level_name = GetLevelName(entry.log_level);
if (entry.count < 2) {
snprintf(out_text, text_len, "[%4u.%06u] %s <%s> %s: %s", time_seconds, time_fractional, snprintf(out_text, text_len, "[%4u.%06u] %s <%s> %s: %s", time_seconds, time_fractional,
class_name, level_name, TrimSourcePath(entry.location.c_str()), entry.message.c_str()); class_name, level_name, TrimSourcePath(entry.location.c_str()),
entry.message.c_str());
} else {
snprintf(out_text, text_len, "[%4u.%06u] %s <%s> %s: %s (repeats %d times)", time_seconds,
time_fractional, class_name, level_name, TrimSourcePath(entry.location.c_str()),
entry.message.c_str(), entry.count);
}
} }
void PrintMessage(const Entry& entry) { void PrintMessage(const Entry& entry) {