aboutsummaryrefslogtreecommitdiff
path: root/src/common/logging/filter.cpp
diff options
context:
space:
mode:
authorlizzie <lizzie@eden-emu.dev>2026-03-12 18:29:15 +0100
committercrueter <crueter@eden-emu.dev>2026-03-12 18:29:15 +0100
commit395613b01f918b559f0a3b1718c78f81987c49d4 (patch)
treea7f6523d31d638ecc948359a80c0be2d1b4a90e6 /src/common/logging/filter.cpp
parent2896fa3835c4042b0878b2bb6c66a7d343f20180 (diff)
[common/logging] Simplify logging logic and fix issues when logging before system is created (#3688)
- our logging code was bigger than spdlog itself, why???? just keep it simple - fix issues when logging before logging system is even started - removes the "initialized logging twice" issue - removes uneeded indirection in file logging - uses direct formatting instead of jumping hoopla-around the fmt::format() ressult - code duplication and dead code removal as usual I did explore dup2() but I think it's not worth the hassle I did try `fwopen()` but it's better if things are just kept as-is. there is a lot of noise because I removed a bunch of redundant files on logging and just put everything in one file now normally this wouldn't be a good idea, however consider: the complexity of logging; it's less than 500 lines... does it really need a whole subsystem?!?!?! ITS JUST LOGGING Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3688 Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: DraVee <chimera@dravee.dev> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src/common/logging/filter.cpp')
-rw-r--r--src/common/logging/filter.cpp242
1 files changed, 0 insertions, 242 deletions
diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp
deleted file mode 100644
index 813e812780..0000000000
--- a/src/common/logging/filter.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: 2014 Citra Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <algorithm>
-#include "common/logging/filter.h"
-#include "common/string_util.h"
-
-namespace Common::Log {
-namespace {
-template <typename It>
-Level GetLevelByName(const It begin, const It end) {
- for (u32 i = 0; i < u32(Level::Count); ++i) {
- const char* level_name = GetLevelName(Level(i));
- if (Common::ComparePartialString(begin, end, level_name))
- return Level(i);
- }
- return Level::Count;
-}
-
-template <typename It>
-Class GetClassByName(const It begin, const It end) {
- for (u32 i = 0; i < u32(Class::Count); ++i) {
- const char* level_name = GetLogClassName(Class(i));
- if (Common::ComparePartialString(begin, end, level_name))
- return Class(i);
- }
- return Class::Count;
-}
-
-template <typename Iterator>
-bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) {
- auto level_separator = std::find(begin, end, ':');
- if (level_separator == end) {
- LOG_ERROR(Log, "Invalid log filter. Must specify a log level after `:`: {}",
- std::string(begin, end));
- return false;
- }
-
- const Level level = GetLevelByName(level_separator + 1, end);
- if (level == Level::Count) {
- LOG_ERROR(Log, "Unknown log level in filter: {}", std::string(begin, end));
- return false;
- }
-
- if (Common::ComparePartialString(begin, level_separator, "*")) {
- instance.ResetAll(level);
- return true;
- }
-
- const Class log_class = GetClassByName(begin, level_separator);
- if (log_class == Class::Count) {
- LOG_ERROR(Log, "Unknown log class in filter: {}", std::string(begin, end));
- return false;
- }
-
- instance.SetClassLevel(log_class, level);
- return true;
-}
-} // Anonymous namespace
-
-/// 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, ARM) \
- 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, ACC) \
- SUB(Service, Audio) \
- SUB(Service, AM) \
- SUB(Service, AOC) \
- SUB(Service, APM) \
- SUB(Service, ARP) \
- SUB(Service, BCAT) \
- SUB(Service, BPC) \
- SUB(Service, BGTC) \
- SUB(Service, BTDRV) \
- SUB(Service, BTM) \
- SUB(Service, Capture) \
- SUB(Service, ERPT) \
- SUB(Service, ETicket) \
- SUB(Service, EUPLD) \
- SUB(Service, Fatal) \
- SUB(Service, FGM) \
- SUB(Service, Friend) \
- SUB(Service, FS) \
- SUB(Service, GRC) \
- SUB(Service, HID) \
- SUB(Service, IRS) \
- SUB(Service, JIT) \
- SUB(Service, LBL) \
- SUB(Service, LDN) \
- SUB(Service, LDR) \
- SUB(Service, LM) \
- SUB(Service, Migration) \
- SUB(Service, Mii) \
- SUB(Service, MM) \
- SUB(Service, MNPP) \
- SUB(Service, NCM) \
- SUB(Service, NFC) \
- SUB(Service, NFP) \
- SUB(Service, NGC) \
- SUB(Service, NIFM) \
- SUB(Service, NIM) \
- SUB(Service, NOTIF) \
- SUB(Service, NPNS) \
- SUB(Service, NS) \
- SUB(Service, NVDRV) \
- SUB(Service, Nvnflinger) \
- SUB(Service, OLSC) \
- SUB(Service, PCIE) \
- SUB(Service, PCTL) \
- SUB(Service, PCV) \
- SUB(Service, PM) \
- SUB(Service, PREPO) \
- SUB(Service, PSC) \
- SUB(Service, PTM) \
- SUB(Service, SET) \
- SUB(Service, SM) \
- SUB(Service, SPL) \
- SUB(Service, SSL) \
- SUB(Service, TCAP) \
- SUB(Service, Time) \
- SUB(Service, USB) \
- SUB(Service, VI) \
- SUB(Service, WLAN) \
- CLS(HW) \
- SUB(HW, Memory) \
- SUB(HW, LCD) \
- SUB(HW, GPU) \
- SUB(HW, AES) \
- CLS(IPC) \
- CLS(Frontend) \
- CLS(Render) \
- SUB(Render, Software) \
- SUB(Render, OpenGL) \
- SUB(Render, Vulkan) \
- CLS(Shader) \
- SUB(Shader, SPIRV) \
- SUB(Shader, GLASM) \
- SUB(Shader, GLSL) \
- CLS(Audio) \
- SUB(Audio, DSP) \
- SUB(Audio, Sink) \
- CLS(Input) \
- CLS(Network) \
- CLS(Loader) \
- CLS(CheatEngine) \
- CLS(Crypto) \
- CLS(WebService)
-
-// 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;
- ALL_LOG_CLASSES()
-#undef CLS
-#undef SUB
- case Class::Count:
- break;
- }
- return "Invalid";
-}
-
-const char* GetLevelName(Level log_level) {
-#define LVL(x) \
- case Level::x: \
- return #x
- switch (log_level) {
- LVL(Trace);
- LVL(Debug);
- LVL(Info);
- LVL(Warning);
- LVL(Error);
- LVL(Critical);
- case Level::Count:
- break;
- }
-#undef LVL
- return "Invalid";
-}
-
-Filter::Filter(Level default_level) {
- ResetAll(default_level);
-}
-
-void Filter::ResetAll(Level level) {
- class_levels.fill(level);
-}
-
-void Filter::SetClassLevel(Class log_class, Level level) {
- class_levels[static_cast<std::size_t>(log_class)] = level;
-}
-
-void Filter::ParseFilterString(std::string_view filter_view) {
- auto clause_begin = filter_view.cbegin();
- while (clause_begin != filter_view.cend()) {
- auto clause_end = std::find(clause_begin, filter_view.cend(), ' ');
-
- // If clause isn't empty
- if (clause_end != clause_begin) {
- ParseFilterRule(*this, clause_begin, clause_end);
- }
-
- if (clause_end != filter_view.cend()) {
- // Skip over the whitespace
- ++clause_end;
- }
- clause_begin = clause_end;
- }
-}
-
-bool Filter::CheckMessage(Class log_class, Level level) const {
- return u8(level) >= u8(class_levels[std::size_t(log_class)]);
-}
-
-bool Filter::IsDebug() const {
- return std::any_of(class_levels.begin(), class_levels.end(), [](const Level& l) {
- return u8(l) <= u8(Level::Debug);
- });
-}
-
-} // namespace Common::Log
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-04 08:53:00 +0000