summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Rowe <jroweboy@gmail.com>2018-07-14 20:47:14 +0200
committerJames Rowe <jroweboy@gmail.com>2018-07-15 21:02:09 +0200
commit497b81558e2543f3b42e4267d8ea9acc40bdf03b (patch)
tree47654b29d6ddd302315de8ff5e0593ca8de9ef77
parentLogging: Don't lock the queue for the duration of the write (diff)
downloadyuzu-497b81558e2543f3b42e4267d8ea9acc40bdf03b.tar
yuzu-497b81558e2543f3b42e4267d8ea9acc40bdf03b.tar.gz
yuzu-497b81558e2543f3b42e4267d8ea9acc40bdf03b.tar.bz2
yuzu-497b81558e2543f3b42e4267d8ea9acc40bdf03b.tar.lz
yuzu-497b81558e2543f3b42e4267d8ea9acc40bdf03b.tar.xz
yuzu-497b81558e2543f3b42e4267d8ea9acc40bdf03b.tar.zst
yuzu-497b81558e2543f3b42e4267d8ea9acc40bdf03b.zip
-rw-r--r--src/common/logging/backend.cpp3
-rw-r--r--src/common/logging/filter.cpp7
-rw-r--r--src/common/logging/filter.h3
3 files changed, 12 insertions, 1 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 5313b8510..ed1e93cc2 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -5,6 +5,7 @@
#include <algorithm>
#include <array>
#include <chrono>
+#include <climits>
#include <condition_variable>
#include <memory>
#include <thread>
@@ -94,7 +95,7 @@ private:
}
// Drain the logging queue. Only writes out up to MAX_LOGS_TO_WRITE to prevent a case
// where a system is repeatedly spamming logs even on close.
- constexpr int MAX_LOGS_TO_WRITE = 100;
+ const int MAX_LOGS_TO_WRITE = filter.IsDebug() ? INT_MAX : 100;
int logs_written = 0;
while (logs_written++ < MAX_LOGS_TO_WRITE && message_queue.Pop(entry)) {
write_logs(entry);
diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp
index 4e783a577..6ed087beb 100644
--- a/src/common/logging/filter.cpp
+++ b/src/common/logging/filter.cpp
@@ -94,4 +94,11 @@ bool Filter::ParseFilterRule(const std::string::const_iterator begin,
bool Filter::CheckMessage(Class log_class, Level level) const {
return static_cast<u8>(level) >= static_cast<u8>(class_levels[static_cast<size_t>(log_class)]);
}
+
+bool Filter::IsDebug() const {
+ return std::any_of(class_levels.begin(), class_levels.end(), [](const Level& l) {
+ return static_cast<u8>(l) <= static_cast<u8>(Level::Debug);
+ });
+}
+
} // namespace Log
diff --git a/src/common/logging/filter.h b/src/common/logging/filter.h
index ccca289bd..2a4f7c845 100644
--- a/src/common/logging/filter.h
+++ b/src/common/logging/filter.h
@@ -47,6 +47,9 @@ public:
/// Matches class/level combination against the filter, returning true if it passed.
bool CheckMessage(Class log_class, Level level) const;
+ /// Returns true if any logging classes are set to debug
+ bool IsDebug() const;
+
private:
std::array<Level, (size_t)Class::Count> class_levels;
};