From dc8479928c5aee4c6ad6fe4f59006fb604cee701 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sun, 18 Sep 2016 09:38:01 +0900
Subject: Sources: Run clang-format on everything.
---
src/common/logging/backend.cpp | 139 +++++++++++++++++++++--------------------
1 file changed, 71 insertions(+), 68 deletions(-)
(limited to 'src/common/logging/backend.cpp')
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 0b2fabec93..b3d6598e44 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -16,73 +16,79 @@
namespace Log {
/// Macro listing all log classes. Code should define CLS and SUB as desired before invoking this.
-#define ALL_LOG_CLASSES() \
- CLS(Log) \
- CLS(Common) \
- SUB(Common, Filesystem) \
- SUB(Common, Memory) \
- CLS(Core) \
- SUB(Core, ARM11) \
- SUB(Core, Timing) \
- CLS(Config) \
- CLS(Debug) \
- SUB(Debug, Emulated) \
- SUB(Debug, GPU) \
- SUB(Debug, Breakpoint) \
- SUB(Debug, GDBStub) \
- CLS(Kernel) \
- SUB(Kernel, SVC) \
- CLS(Service) \
- SUB(Service, SRV) \
- SUB(Service, FRD) \
- SUB(Service, FS) \
- SUB(Service, ERR) \
- SUB(Service, APT) \
- SUB(Service, GSP) \
- SUB(Service, AC) \
- SUB(Service, AM) \
- SUB(Service, PTM) \
- SUB(Service, LDR) \
- SUB(Service, NDM) \
- SUB(Service, NIM) \
- SUB(Service, NWM) \
- SUB(Service, CAM) \
- SUB(Service, CECD) \
- SUB(Service, CFG) \
- SUB(Service, DSP) \
- SUB(Service, DLP) \
- SUB(Service, HID) \
- SUB(Service, SOC) \
- SUB(Service, IR) \
- SUB(Service, Y2R) \
- CLS(HW) \
- SUB(HW, Memory) \
- SUB(HW, LCD) \
- SUB(HW, GPU) \
- CLS(Frontend) \
- CLS(Render) \
- SUB(Render, Software) \
- SUB(Render, OpenGL) \
- CLS(Audio) \
- SUB(Audio, DSP) \
- SUB(Audio, Sink) \
- CLS(Loader)
+#define ALL_LOG_CLASSES() \
+ CLS(Log) \
+ CLS(Common) \
+ SUB(Common, Filesystem) \
+ SUB(Common, Memory) \
+ CLS(Core) \
+ SUB(Core, ARM11) \
+ SUB(Core, Timing) \
+ CLS(Config) \
+ CLS(Debug) \
+ SUB(Debug, Emulated) \
+ SUB(Debug, GPU) \
+ SUB(Debug, Breakpoint) \
+ SUB(Debug, GDBStub) \
+ CLS(Kernel) \
+ SUB(Kernel, SVC) \
+ CLS(Service) \
+ SUB(Service, SRV) \
+ SUB(Service, FRD) \
+ SUB(Service, FS) \
+ SUB(Service, ERR) \
+ SUB(Service, APT) \
+ SUB(Service, GSP) \
+ SUB(Service, AC) \
+ SUB(Service, AM) \
+ SUB(Service, PTM) \
+ SUB(Service, LDR) \
+ SUB(Service, NDM) \
+ SUB(Service, NIM) \
+ SUB(Service, NWM) \
+ SUB(Service, CAM) \
+ SUB(Service, CECD) \
+ SUB(Service, CFG) \
+ SUB(Service, DSP) \
+ SUB(Service, DLP) \
+ SUB(Service, HID) \
+ SUB(Service, SOC) \
+ SUB(Service, IR) \
+ SUB(Service, Y2R) \
+ CLS(HW) \
+ SUB(HW, Memory) \
+ SUB(HW, LCD) \
+ SUB(HW, GPU) \
+ CLS(Frontend) \
+ CLS(Render) \
+ SUB(Render, Software) \
+ SUB(Render, OpenGL) \
+ CLS(Audio) \
+ SUB(Audio, DSP) \
+ SUB(Audio, Sink) \
+ CLS(Loader)
// GetClassName is a macro defined by Windows.h, grrr...
const char* GetLogClassName(Class log_class) {
switch (log_class) {
-#define CLS(x) case Class::x: return #x;
-#define SUB(x, y) case Class::x##_##y: return #x "." #y;
+#define CLS(x) \
+ case Class::x: \
+ return #x;
+#define SUB(x, y) \
+ case Class::x##_##y: \
+ return #x "." #y;
ALL_LOG_CLASSES()
#undef CLS
#undef SUB
- case Class::Count:
- UNREACHABLE();
+ case Class::Count:
+ UNREACHABLE();
}
}
const char* GetLevelName(Level log_level) {
-#define LVL(x) case Level::x: return #x
+#define LVL(x) \
+ case Level::x: \
+ return #x
switch (log_level) {
LVL(Trace);
LVL(Debug);
@@ -90,15 +96,14 @@ const char* GetLevelName(Level log_level) {
LVL(Warning);
LVL(Error);
LVL(Critical);
- case Level::Count:
- UNREACHABLE();
+ case Level::Count:
+ UNREACHABLE();
}
#undef LVL
}
-Entry CreateEntry(Class log_class, Level log_level,
- const char* filename, unsigned int line_nr, const char* function,
- const char* format, va_list args) {
+Entry CreateEntry(Class log_class, Level log_level, const char* filename, unsigned int line_nr,
+ const char* function, const char* format, va_list args) {
using std::chrono::steady_clock;
using std::chrono::duration_cast;
@@ -111,7 +116,8 @@ Entry CreateEntry(Class log_class, Level log_level,
entry.log_class = log_class;
entry.log_level = log_level;
- snprintf(formatting_buffer.data(), formatting_buffer.size(), "%s:%s:%u", filename, function, line_nr);
+ snprintf(formatting_buffer.data(), formatting_buffer.size(), "%s:%s:%u", filename, function,
+ line_nr);
entry.location = std::string(formatting_buffer.data());
vsnprintf(formatting_buffer.data(), formatting_buffer.size(), format, args);
@@ -126,19 +132,16 @@ void SetFilter(Filter* new_filter) {
filter = new_filter;
}
-void LogMessage(Class log_class, Level log_level,
- const char* filename, unsigned int line_nr, const char* function,
- const char* format, ...) {
+void LogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_nr,
+ const char* function, const char* format, ...) {
if (filter != nullptr && !filter->CheckMessage(log_class, log_level))
return;
va_list args;
va_start(args, format);
- 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);
PrintColoredMessage(entry);
}
-
}
--
cgit v1.2.3-70-g09d2